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

[x32] Build a linux-libc-dev package 

svn path=/dists/trunk/linux/; revision=19166
This commit is contained in:
Ben Hutchings 2012-06-18 14:50:18 +00:00
parent aec4f5775d
commit 1f377f7c3b
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/bin/gencontrol.py vendored
View File

@ -86,6 +86,10 @@ class Gencontrol(Base):
self._setup_makeflags(self.arch_makeflags, makeflags, config_base) self._setup_makeflags(self.arch_makeflags, makeflags, config_base)
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
# Some userland architectures require kernels from another
# (Debian) architecture, e.g. x32/amd64.
foreign_kernel = not self.config['base', arch].get('featuresets')
if self.version.linux_modifier is None: if self.version.linux_modifier is None:
try: try:
vars['abiname'] = '-%s' % self.config['abi', arch]['abiname'] vars['abiname'] = '-%s' % self.config['abi', arch]['abiname']
@ -93,8 +97,12 @@ class Gencontrol(Base):
vars['abiname'] = self.abiname vars['abiname'] = self.abiname
makeflags['ABINAME'] = vars['abiname'] makeflags['ABINAME'] = vars['abiname']
headers_arch = self.templates["control.headers.arch"] if foreign_kernel:
packages_headers_arch = self.process_packages(headers_arch, vars) packages_headers_arch = []
makeflags['FOREIGN_KERNEL'] = True
else:
headers_arch = self.templates["control.headers.arch"]
packages_headers_arch = self.process_packages(headers_arch, vars)
libc_dev = self.templates["control.libc-dev"] libc_dev = self.templates["control.libc-dev"]
packages_headers_arch[0:0] = self.process_packages(libc_dev, {}) packages_headers_arch[0:0] = self.process_packages(libc_dev, {})

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ linux (3.4.3-1~experimental.1) UNRELEASED; urgency=low
* [x86] Enable BATTERY_SBS as module (Closes: #662902) * [x86] Enable BATTERY_SBS as module (Closes: #662902)
* team: Enable NET_TEAM_MODE_LOADBALANCE as module * team: Enable NET_TEAM_MODE_LOADBALANCE as module
* [rt] Update to 3.4.2-rt10 (no functional change) * [rt] Update to 3.4.2-rt10 (no functional change)
* [x32] Build a linux-libc-dev package
-- Ben Hutchings <ben@decadent.org.uk> Thu, 07 Jun 2012 04:45:03 +0100 -- Ben Hutchings <ben@decadent.org.uk> Thu, 07 Jun 2012 04:45:03 +0100

1
debian/config/defines vendored
View File

@ -20,6 +20,7 @@ arches:
sh4 sh4
sparc sparc
sparc64 sparc64
x32
compiler: gcc-4.6 compiler: gcc-4.6
featuresets: featuresets:
none none

4
debian/config/x32/defines vendored Normal file
View File

@ -0,0 +1,4 @@
[base]
kernel-arch: x86
featuresets:
# empty; x32 must be part of a multiarch installation with an amd64 kernel

4
debian/rules.real vendored
View File

@ -35,7 +35,9 @@ MAKEOVERRIDES =
# #
# Targets # Targets
# #
binary-arch-arch: install-headers_$(ARCH) ifneq ($(FOREIGN_KERNEL),True)
binary-arch-arch: install-headers_$(ARCH)
endif
binary-arch-arch: install-libc-dev_$(ARCH) binary-arch-arch: install-libc-dev_$(ARCH)
binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET) binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE) binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)