[kernel] r14231 - in dists/trunk/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Mon Sep 14 09:51:34 2009
New Revision: 14231

Log:
debian/bin/gencontrol.py, debian/rules.real:
Remove support for header architecture != real architecture.

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Mon Sep 14 09:46:17 2009	(r14230)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Mon Sep 14 09:51:34 2009	(r14231)
@@ -31,8 +31,6 @@
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)
-        config_libc_dev = self.config.merge('libc-dev', arch)
-        makeflags['LIBC_DEV_ARCH'] = config_libc_dev.get('arch', config_base.get('kernel-arch'))
 
         data = vars.copy()
         data.update(config_base)

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Mon Sep 14 09:46:17 2009	(r14230)
+++ dists/trunk/linux-2.6/debian/rules.real	Mon Sep 14 09:51:34 2009	(r14231)
@@ -274,8 +274,8 @@
 	dh_prep
 	rm -rf '$(DIR)'
 	mkdir $(DIR)
-	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(LIBC_DEV_ARCH)
-	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(LIBC_DEV_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(ARCH)
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
 	+$(MAKE_SELF) install-base
 
 install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)