[kernel] r6059 - in dists/trunk/linux-2.6/debian: . modules templates

[Bastian Blank]

Author: waldi
Date: Sat Mar  4 17:04:46 2006
New Revision: 6059

Modified:
   dists/trunk/linux-2.6/debian/modules/gencontrol.py
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
Log:
* 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.


Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py	Sat Mar  4 17:04:46 2006
@@ -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 @@
         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)

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sat Mar  4 17:04:46 2006
@@ -12,6 +12,7 @@
 
 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 @@
 	
 	$(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)

Modified: dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.arch.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.arch.in	Sat Mar  4 17:04:46 2006
@@ -1,7 +1,7 @@
 Package: linux-headers- at version@
 Section: devel
 Priority: optional
-Provides: linux-headers- at upstreamversion@@abiname at -all, linux-headers- at major@-all
+Provides: linux-headers- at upstreamversion@@abiname at -all, linux-headers- at 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