[kernel] r6322 - in dists/sid/linux-2.6/debian: . bin
lib/python/debian_linux templates
Bastian Blank
waldi at costa.debian.org
Tue Mar 28 20:20:29 UTC 2006
Author: waldi
Date: Tue Mar 28 20:20:23 2006
New Revision: 6322
Modified:
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/sid/linux-2.6/debian/rules.real
dists/sid/linux-2.6/debian/templates/control.headers.arch.in
Log:
* debian/bin/gencontrol.py
- Add depends against headers packages to an arch specific package.
- Remove special handling of the headers all package.
* debian/lib/python/debian_linux/gencontrol.py: Export arch for templates.
* debian/rules.real: Support arch specific headers packages.
* debian/templates/control.headers.arch.in: Add arch specific kernel packages.
Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py Tue Mar 28 20:20:23 2006
@@ -22,32 +22,29 @@
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
headers_arch = self.templates["control.headers.arch"]
- package_headers_arch = self.process_package(headers_arch[0], vars)
- extra['headers_arch_depends'] = []
+ packages_headers_arch = self.process_packages(headers_arch, vars)
+ extra['headers_arch_depends'] = packages_headers_arch[2]['Depends']
- name = package_headers_arch['Package']
- if packages.has_key(name):
- package_headers_arch = packages.get(name)
- package_headers_arch['Architecture'].append(arch)
- else:
- package_headers_arch['Architecture'] = [arch]
- packages.append(package_headers_arch)
+ for package in packages_headers_arch:
+ name = package['Package']
+ if packages.has_key(name):
+ package = packages.get(name)
+ package['Architecture'].append(arch)
+ else:
+ package['Architecture'] = [arch]
+ packages.append(package)
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+ cmds_binary_arch = []
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags_string))
cmds_source = []
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags_string,))
+ makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
makefile.append(("build-%s-real:" % arch))
makefile.append(("setup-%s-real:" % arch))
makefile.append(("source-%s-real:" % arch, cmds_source))
- def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
- makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(["%s (= %s)" % (i, self.version['source']) for i in extra['headers_arch_depends']]), makeflags_string),))
- makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
-
def do_subarch_setup(self, vars, makeflags, arch, subarch):
vars.update(self.config.get(('image', arch, subarch), {}))
vars['localversion_headers'] = vars['localversion']
@@ -139,7 +136,7 @@
package['Architecture'] = [arch]
packages.append(package)
- extra['headers_arch_depends'].append(packages_own[1]['Package'])
+ extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[1]['Package'])
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Tue Mar 28 20:20:23 2006
@@ -96,6 +96,7 @@
def do_arch(self, packages, makefile, arch, vars, makeflags):
config_entry = self.config['base', arch]
vars.update(config_entry)
+ vars['arch'] = arch
if not config_entry.get('available', True):
for i in self.makefile_targets:
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real (original)
+++ dists/sid/linux-2.6/debian/rules.real Tue Mar 28 20:20:23 2006
@@ -66,6 +66,7 @@
#
# Targets
#
+binary-arch-arch: install-headers-all install-headers-$(ARCH)
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -196,6 +197,13 @@
dh_clean -d -k
$(MAKE) -f debian/rules.real install-base
+install-headers-$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
+install-headers-$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
+install-headers-$(ARCH):
+ dh_testdir
+ dh_testroot
+ $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
+
install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-header-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
@@ -308,9 +316,9 @@
dh_testdir
dh_testroot
chmod a+x debian/modules/gencontrol.py
- dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
- dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
- $(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)'
+ dh_install debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
+ dh_python -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
+ $(MAKE) -f debian/rules.real install-base
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
Modified: dists/sid/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.headers.arch.in (original)
+++ dists/sid/linux-2.6/debian/templates/control.headers.arch.in Tue Mar 28 20:20:23 2006
@@ -1,9 +1,29 @@
Package: linux-headers- at version@
Section: devel
Priority: optional
-Provides: linux-headers- at upstreamversion@@abiname at -all, linux-headers- at major@-all, ${kernel:Provides}
-Depends: ${kernel:Depends}
+Depends: python2.4-minimal
Description: All header files for Linux kernel @version@
This package depends against all architecture-specific kernel header files
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
+
+Package: linux-headers- at upstreamversion@@abiname at -all
+Section: devel
+Priority: optional
+Provides: linux-headers- at major@-all, linux-headers- at version@-all
+Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${Source-Version})
+Description: All header files for Linux kernel @version@
+ This package depends against all architecture-specific kernel header files
+ for Linux kernel version @upstreamversion@, generally used for building out-of-tree
+ kernel modules.
+
+Package: linux-headers- at upstreamversion@@abiname at -all-@arch@
+Section: devel
+Priority: optional
+Provides: linux-headers- at major@-all- at arch@, linux-headers- at version@-all- at arch@
+Depends: linux-headers- at version@ (= ${Source-Version})
+Description: All header files for Linux kernel @version@
+ This package depends against all architecture-specific kernel header files
+ for Linux kernel version @upstreamversion@, generally used for building out-of-tree
+ kernel modules.
+
More information about the Kernel-svn-changes
mailing list