diff options
| -rwxr-xr-x | debian/bin/gencontrol.py | 6 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/rules.real | 12 | ||||
| -rw-r--r-- | debian/templates/control.headers.arch.in | 10 | ||||
| -rw-r--r-- | debian/templates/control.support.in | 7 |
5 files changed, 21 insertions, 19 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 910a19fb024a..3848438ee50b 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -21,11 +21,13 @@ class gencontrol(debian_linux.gencontrol.gencontrol): vars.update(self.config.get(('image', arch), {})) def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): + packages_support = self.process_packages(self.templates["control.support"], vars) headers_arch = self.templates["control.headers.arch"] packages_headers_arch = self.process_packages(headers_arch, vars) - extra['headers_arch_depends'] = packages_headers_arch[2]['Depends'] + + extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list() - for package in packages_headers_arch: + for package in packages_support + packages_headers_arch: name = package['Package'] if packages.has_key(name): package = packages.get(name) diff --git a/debian/changelog b/debian/changelog index fde3b38a2c4a..65dfe7542af6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ linux-2.6 (2.6.16-5) UNRELEASED; urgency=low [ Bastian Blank ] * Provide real dependency packages for module building. + - Add linux-headers-$version-$abiname-all and + linux-headers-$version-$abiname-all-$arch. + * Rename support package to linux-support-$version-$abiname. * Fix module package output. * Include .kernelrelease in headers packages. (closes: #359813) * Disable Cumana partition support completely. (closes: #359207) @@ -15,7 +18,7 @@ linux-2.6 (2.6.16-5) UNRELEASED; urgency=low [ dann frazier ] * [ia64] initramfs-tools works now, no longer restrict initramfs-generators - -- dann frazier <dannf@debian.org> Thu, 30 Mar 2006 15:45:35 -0700 + -- Bastian Blank <waldi@debian.org> Sun, 2 Apr 2006 16:21:29 +0200 linux-2.6 (2.6.16-4) unstable; urgency=medium diff --git a/debian/rules.real b/debian/rules.real index 087dc4242197..4c799ac9b81d 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -66,7 +66,7 @@ endif # # Targets # -binary-arch-arch: install-headers-all install-headers-$(ARCH) +binary-arch-arch: install-support install-headers-$(ARCH) binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH) binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE) ifeq ($(MODULES),True) @@ -317,14 +317,14 @@ install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBA $(MAKE) -f debian/rules.real install-base -install-headers-all: PACKAGE_NAME = linux-headers-$(VERSION) -install-headers-all: DH_OPTIONS = -p$(PACKAGE_NAME) -install-headers-all: +install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME) +install-support: DH_OPTIONS = -p$(PACKAGE_NAME) +install-support: dh_testdir dh_testroot chmod a+x debian/modules/gencontrol.py - 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 + dh_install debian/arch debian/lib debian/modules /usr/src/$(PACKAGE_NAME) + dh_python -V 2.4 /usr/src/$(PACKAGE_NAME)/lib/python $(MAKE) -f debian/rules.real install-base install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION) diff --git a/debian/templates/control.headers.arch.in b/debian/templates/control.headers.arch.in index b2ccee9d4c4b..aed754692831 100644 --- a/debian/templates/control.headers.arch.in +++ b/debian/templates/control.headers.arch.in @@ -1,12 +1,3 @@ -Package: linux-headers-@version@ -Section: devel -Priority: optional -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-@upstreamversion@@abiname@-all Section: devel Priority: optional @@ -21,7 +12,6 @@ Package: linux-headers-@upstreamversion@@abiname@-all-@arch@ Section: devel Priority: optional Provides: linux-headers-@major@-all-@arch@, linux-headers-@version@-all-@arch@ -Depends: linux-headers-@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 diff --git a/debian/templates/control.support.in b/debian/templates/control.support.in new file mode 100644 index 000000000000..c3a04f630873 --- /dev/null +++ b/debian/templates/control.support.in @@ -0,0 +1,7 @@ +Package: linux-support-@upstreamversion@@abiname@ +Section: devel +Priority: optional +Depends: python2.4-minimal +Description: Support files for Linux kernel @upstreamversion@ + This package provides support files for the Linux kernel build. + |