[kernel] r12870 - in dists/trunk/linux-2.6/debian/patches: debian series

[Maximilian Attems]

Author: maks
Date: Thu Feb 19 14:46:05 2009
New Revision: 12870

Log:
fix kernelvariables.patch

seems needed by build for non x86..

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

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	Thu Feb 19 14:46:05 2009
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index f3e2065..3cc474a 100644
+index 59cf6da..6e1e048 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,25 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
+@@ -193,30 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?=
  
@@ -18,20 +18,25 @@
 -        SRCARCH := x86
 -endif
 -
--# Where to locate arch specific headers
+-# Additional ARCH settings for sparc
 -ifeq ($(ARCH),sparc64)
--       hdr-arch  := sparc
--else
--       hdr-arch  := $(SRCARCH)
+-       SRCARCH := sparc
+-endif
+-
+-# Where to locate arch specific headers
+-hdr-arch  := $(SRCARCH)
+-
+-ifeq ($(ARCH),m68knommu)
+-       hdr-arch  := m68k
 -endif
 -
  KCONFIG_CONFIG	?= .config
  
  # SHELL used by kbuild
-@@ -329,6 +310,27 @@ CFLAGS_KERNEL	=
+@@ -334,6 +310,31 @@ LDFLAGS_MODULE  =
+ CFLAGS_KERNEL	=
  AFLAGS_KERNEL	=
  
- 
 +-include .kernelvariables
 +
 +# Architecture as present in compile.h
@@ -46,13 +51,17 @@
 +        SRCARCH := x86
 +endif
 +
-+# Where to locate arch specific headers
++# Additional ARCH settings for sparc
 +ifeq ($(ARCH),sparc64)
-+	hdr-arch  := sparc
-+else
-+	hdr-arch  := $(SRCARCH)
++       SRCARCH := sparc
 +endif
 +
++# Where to locate arch specific headers
++hdr-arch  := $(SRCARCH)
++
++ifeq ($(ARCH),m68knommu)
++       hdr-arch  := m68k
++endif
+ 
  # Use LINUXINCLUDE when you must reference the include/ directory.
  # Needed to be compatible with the O= option
- LINUXINCLUDE    := -Iinclude \

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Feb 19 14:46:05 2009
@@ -1,5 +1,5 @@
 + debian/version.patch
-#+ debian/kernelvariables.patch
++ debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
 + debian/scripts-kconfig-reportoldconfig.patch