[kernel] r7482 - dists/trunk/linux-2.6/debian/patches/debian

[Bastian Blank]

Author: waldi
Date: Fri Sep 22 17:17:09 2006
New Revision: 7482

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch

Log:
debian/patches/debian/kernelvariables.patch:
Define UTS_MACHINE after our include file.


Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Fri Sep 22 17:17:09 2006
@@ -1,13 +1,26 @@
 diff --git a/Makefile b/Makefile
-index a3a7baa..32d9ea4 100644
+index edfc2fd..2fb76d7 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -296,6 +296,8 @@ LDFLAGS_MODULE  = -r
+@@ -176,9 +176,6 @@ # Note: Some architectures assign CROSS_
+ ARCH		?= $(SUBARCH)
+ CROSS_COMPILE	?=
+ 
+-# Architecture as present in compile.h
+-UTS_MACHINE := $(ARCH)
+-
+ KCONFIG_CONFIG	?= .config
+ 
+ # SHELL used by kbuild
+@@ -298,6 +295,11 @@ LDFLAGS_MODULE  = -r
  CFLAGS_KERNEL	=
  AFLAGS_KERNEL	=
  
 +-include .kernelvariables
 +
++# Architecture as present in compile.h
++UTS_MACHINE := $(ARCH)
++
  
  # Use LINUXINCLUDE when you must reference the include/ directory.
  # Needed to be compatible with the O= option