r4038 - in people/waldi/kernel/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-23 20:42:52 +0000 (Tue, 23 Aug 2005)
New Revision: 4038

Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/linux-2.6/debian/rules.real
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in
Log:
* debian/bin/gencontrol.py: Use special rule for building the general headers package.
* debian/rules.real: Add rules.
* debian/templates/control.headers.main.in: Drop -all suffix.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 20:05:05 UTC (rev 4037)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 20:42:52 UTC (rev 4038)
@@ -253,15 +253,18 @@
             makefile.append(("%s-%s:" % (i, arch), ["@echo Architecture %s is not available!" % arch, "@exit 1"]))
         return
 
-    for i in (('setup',)):
+    for i in (('binary-arch', 'setup',)):
         makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
 
     makeflags['ARCH'] = arch
     makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
+    cmds_binary_arch = []
     cmds_setup = []
+    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all %s" % makeflags_string,))
     cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags_string,))
     makefile.append(("setup-%s-real:" % arch, cmds_setup))
+    makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
 
     for subarch in config_entry['subarches']:
         process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy(), package_headers_main)
@@ -311,7 +314,6 @@
     cmds_binary_arch = []
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
-    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-p%s'" % package_headers_main['Package'],))
     cmds_build = []
     cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
     cmds_setup = []

Modified: people/waldi/kernel/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/linux-2.6/debian/rules.real	2005-08-23 20:05:05 UTC (rev 4037)
+++ people/waldi/kernel/linux-2.6/debian/rules.real	2005-08-23 20:42:52 UTC (rev 4038)
@@ -250,6 +250,15 @@
 	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
 	rm -rf $(DIR)
 
+install-headers-all: DH_OPTIONS = -plinux-headers-$(VERSION)
+install-headers-all:
+	dh_testdir
+	dh_testroot
+	dh_install $(DH_OPTIONS) debian/arch /usr/src/linux-headers-$(VERSION)
+	dh_installdocs $(DH_OPTIONS)
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
+
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)
 install-patch: pbase := /usr/src/kernel-patches/all/$(VERSION)
 install-patch: pfull := debian/$(PACKAGE)$(pbase)

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-23 20:05:05 UTC (rev 4037)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-23 20:42:52 UTC (rev 4038)
@@ -1,4 +1,4 @@
-Package: linux-headers- at version@-all
+Package: linux-headers- at version@
 Architecture: any
 Section: devel
 Priority: optional