debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Get architecture for linux-libc-dev from the config. Default to kernel arch. 

* debian/bin/gencontrol.py: Pull value out of the config.
* debian/config/i386/defines, debian/config/sparc/defines: Override arch.
* debian/rules.real: Update.

svn path=/dists/trunk/linux-2.6/; revision=9511
This commit is contained in:
Bastian Blank 2007-09-13 15:01:10 +00:00
parent 9a0a52a6c5
commit 423fd38400
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/bin/gencontrol.py vendored
View File

@ -25,7 +25,13 @@ class Gencontrol(Base):
packages.extend(self.process_packages(self.templates["control.support"], self.vars))
def do_arch_setup(self, vars, makeflags, arch, extra):
config_base = self.config.get(('base', arch), {})
vars.update(self.config.get(('image', arch), {}))
config_libc_dev = self.config.get(('libc-dev', arch), {})
arch = config_libc_dev.get('arch', None)
if arch is None:
arch = config_base.get('kernel-arch')
makeflags['LIBC_DEV_ARCH'] = arch
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
headers_arch = self.templates["control.headers.arch"]

3
debian/config/i386/defines vendored
View File

@ -15,6 +15,9 @@ kernel-header-dirs: i386 x86_64
conflicts: grub (<= 0.95+cvs20040624-17)
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
[libc-dev]
arch: x86_64
[486_base]
class: x86
longclass: x86 and compatible

3
debian/config/sparc/defines vendored
View File

@ -11,6 +11,9 @@ kernel-header-dirs: sparc sparc64
suggests: silo, fdutils
type: kernel-package
[libc-dev]
arch: sparc64
[sparc32_base]
class: uniprocessor sparc32 (sun4m)
kernel-arch: sparc

13
debian/rules.real vendored
View File

@ -332,21 +332,12 @@ install-libc-dev_$(ARCH):
dh_clean -d -k
rm -rf '$(DIR)'
mkdir $(DIR)
$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(HEADERS_ARCH)
$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_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)
# XXX: Needs to be removed from libc6-dev
rm -rf $(OUT_DIR)/include/scsi
$(MAKE_SELF) install-base
# XXX: This needs to be moved into the config
install-libc-dev_$(ARCH): HEADERS_ARCH = $(ARCH)
install-libc-dev_amd64 \
install-libc-dev_i386: HEADERS_ARCH = x86_64
install-libc-dev_armel: HEADERS_ARCH = arm
install-libc-dev_hppa: HEADERS_ARCH = parisc
install-libc-dev_mipsel: HEADERS_ARCH = mips
install-libc-dev_sparc: HEADERS_ARCH = sparc64
install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
install-support: PACKAGE_DIR = debian/$(PACKAGE_NAME)