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

[Bastian Blank]

Author: waldi
Date: Sun Aug 10 09:54:20 2008
New Revision: 12018

Log:
debian/patches/debian/kernelvariables.patch: Fix header architecture setup.


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

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	Sun Aug 10 09:54:20 2008
@@ -1,10 +1,8 @@
-Postpone architecture dependant definitions.
-Makes it possible to overwrite arch, compiler and things like cflags in one
-place.
-
+diff --git a/Makefile b/Makefile
+index f3e2065..3cc474a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,25 +193,6 @@
+@@ -193,25 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?=
  
@@ -30,9 +28,9 @@
  KCONFIG_CONFIG	?= .config
  
  # SHELL used by kbuild
-@@ -340,6 +326,27 @@
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
- KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+@@ -329,6 +310,27 @@ CFLAGS_KERNEL	=
+ AFLAGS_KERNEL	=
+ 
  
 +-include .kernelvariables
 +
@@ -55,6 +53,6 @@
 +	hdr-arch  := $(SRCARCH)
 +endif
 +
- export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
- export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
- export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
+ # Use LINUXINCLUDE when you must reference the include/ directory.
+ # Needed to be compatible with the O= option
+ LINUXINCLUDE    := -Iinclude \