debian/bin/gencontrol.py, debian/rules.real:

Remove support for header architecture != real architecture.

svn path=/dists/trunk/linux-2.6/; revision=14231
This commit is contained in:
Bastian Blank 2009-09-14 09:51:34 +00:00
parent 68381550c5
commit 728e91d725
2 changed files with 2 additions and 4 deletions

View File

@ -31,8 +31,6 @@ class Gencontrol(Base):
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)

4
debian/rules.real vendored
View File

@ -274,8 +274,8 @@ install-libc-dev_$(ARCH):
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)