* debian/modules/gencontrol.py: Add correct build depends.

* debian/rules.real
  - Export DEB_HOST_ARCH.
  - Make the headers all package provide linux-header-$(VERSION)-$(ARCH).
debian/templates/control.headers.arch.in: Add substitution variable.

svn path=/dists/trunk/linux-2.6/; revision=6059
This commit is contained in:
Bastian Blank 2006-03-04 17:04:46 +00:00
parent f7292b8169
commit e06f1a2ccf
3 changed files with 11 additions and 3 deletions

View File

@ -2,6 +2,7 @@
import sys
sys.path.append(sys.path[0] + "/../lib/python")
import debian_linux.gencontrol
from debian_linux.debian import *
class gencontrol(debian_linux.gencontrol.gencontrol):
def do_main_packages(self, packages):
@ -10,6 +11,11 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
main = self.templates["control.main"]
packages.extend(self.process_packages(main, vars))
def do_main_packages(self, packages):
l = package_relation_group()
l.extend([package_relation('linux-headers-%s-%s [%s]' % (self.version['version'], arch, arch)) for arch in self.config['base',]['arches']])
packages['source']['Build-Depends'].append(l)
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
modules = self.templates["control.modules"]
modules = self.process_packages(modules, vars)

6
debian/rules.real vendored
View File

@ -12,6 +12,7 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
export PYTHONPATH = $(CURDIR)/debian/lib/python
export DH_OPTIONS
export DEB_HOST_ARCH
#
# Build the list of common config files to be included
@ -301,14 +302,15 @@ install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBA
$(MAKE) -f debian/rules.real install-base
install-headers-all: DH_OPTIONS = -plinux-headers-$(VERSION)
install-headers-all: PACKAGE_NAME = linux-headers-$(VERSION)
install-headers-all: DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers-all:
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)'
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=$(PACKAGE_NAME)-$(ARCH)'
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)

View File

@ -1,7 +1,7 @@
Package: linux-headers-@version@
Section: devel
Priority: optional
Provides: linux-headers-@upstreamversion@@abiname@-all, linux-headers-@major@-all
Provides: linux-headers-@upstreamversion@@abiname@-all, linux-headers-@major@-all, ${kernel:Provides}
Depends: ${kernel:Depends}
Description: All header files for Linux kernel @version@
This package depends against all architecture-specific kernel header files