r3976 - in people/waldi/kernel/source/linux-2.6/debian: . arch/powerpc arch/sparc bin

[Bastian Blank]

Author: waldi
Date: 2005-08-18 19:06:23 +0000 (Thu, 18 Aug 2005)
New Revision: 3976

Modified:
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
   people/waldi/kernel/source/linux-2.6/debian/arch/sparc/Makefile.inc
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
* debian/arch/powerpc/Makefile.inc, debian/arch/sparc/Makefile.inc: Remove old subarch settings.
* debian/bin/gencontrol.py: Support per subarch kpkg subarch.
* debian/rules.real: Use subarch for header builds.


Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-18 18:57:32 UTC (rev 3975)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-18 19:06:23 UTC (rev 3976)
@@ -2,5 +2,3 @@
 # Variables 
 #
 headers_dirs = ppc | ppc64 | m68k
-headers_subarch = powerpc
-build_subarch = powerpc

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/Makefile.inc	2005-08-18 18:57:32 UTC (rev 3975)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/Makefile.inc	2005-08-18 19:06:23 UTC (rev 3976)
@@ -2,8 +2,6 @@
 # Variables 
 #
 headers_dirs := sparc64
-headers_subarch := sparc64
-build_subarch := @flavour@
 image_postproc = strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/$(subst 32,,$(subst -smp,,$*))/boot/image
 # image_prefix_flavours := sparc32 sparc32-smp
 # image_prefix := sparc32

Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-18 18:57:32 UTC (rev 3975)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-18 19:06:23 UTC (rev 3976)
@@ -421,6 +421,10 @@
 
             subarch_makeflags = arch_makeflags[:]
             subarch_makeflags.extend(["SUBARCH='%s'" % subarch_text, "ABINAME='%s'" % subarch_vars['abiname']])
+            subarch_makeflags_clean = subarch_makeflags[:]
+            if subarch_vars.has_key('kpkg-subarch'):
+                subarch_makeflags.append("KPKG_SUBARCH='%s'" % subarch_vars['kpkg-subarch'])
+
             cmds_binary_arch = []
             cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % ' '.join(subarch_makeflags),))
             cmds_setup = []
@@ -453,7 +457,7 @@
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
                     makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
 
-                flavour_makeflags = subarch_makeflags[:]
+                flavour_makeflags = subarch_makeflags_clean[:]
                 flavour_makeflags.append("FLAVOUR='%s'" % flavour)
                 if flavour_vars.has_key('kpkg-subarch'):
                     flavour_makeflags.append("KPKG_SUBARCH='%s'" % flavour_vars['kpkg-subarch'])

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-18 18:57:32 UTC (rev 3975)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-18 19:06:23 UTC (rev 3976)
@@ -50,10 +50,8 @@
 kpkg_image += --initrd
 ifdef KPKG_SUBARCH
   kpkg_image += --subarch $(KPKG_SUBARCH)
+  kpkg_header += --subarch $(KPKG_SUBARCH)
 endif
-ifdef headers_subarch
-  kpkg_header += --subarch $(headers_subarch)
-endif
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
   kpkg_image += --cross-compile=$(DEB_HOST_GNU_TYPE)
 endif