r3822 - in people/waldi/kernel/source/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: 2005-08-10 13:11:24 +0000 (Wed, 10 Aug 2005)
New Revision: 3822

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Use install-dummy.
* debian/rules.real: Move tree package rules from debian/rules.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 12:56:58 UTC (rev 3821)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 13:11:24 UTC (rev 3822)
@@ -392,7 +392,7 @@
                 flavour_makeflags = subarch_makeflags + " FLAVOUR='%s'" % flavour
                 cmds_binary_arch = []
                 cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % flavour_makeflags,))
-                cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
+                cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
                 cmds_build = []
                 cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % flavour_makeflags,))
                 cmds_setup = []
@@ -420,7 +420,7 @@
             tmp = []
             if i.has_key('X-Version-Overwrite-Epoch'):
                     tmp.append("-v1:%s" % source_version)
-            cmds.append("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
+            cmds.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
         makefile.append(("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch), None))
         makefile.append(("binary-arch-%s-extra:" % arch, cmds))
 

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:56:58 UTC (rev 3821)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:11:24 UTC (rev 3822)
@@ -26,24 +26,6 @@
 include debian/rules.defs
 
 #
-# linux-tree package
-#
-tpkg := linux-tree-$(version)
-tree: debian/tree-stamp
-debian/tree-stamp:
-	dh_testdir
-	dh_testroot
-	dh_installdirs -p$(tpkg)
-	dh_installdocs -p$(tpkg)
-	dh_installchangelogs -p$(tpkg)
-	dh_compress -p$(tpkg)
-	dh_fixperms -p$(tpkg)
-	dh_installdeb -p$(tpkg)
-	dh_gencontrol -p$(tpkg)
-	dh_md5sums -p$(tpkg)
-	dh_builddeb -p$(tpkg)
-	touch debian/tree-stamp
-#
 # linux-patch-debian
 #
 ppkg  := linux-patch-debian-$(version)

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:56:58 UTC (rev 3821)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 13:11:24 UTC (rev 3822)
@@ -81,7 +81,7 @@
 binary-arch-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
-binary-indep: install-source
+binary-indep: install-source install-tree
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
@@ -230,11 +230,7 @@
 	cd $(DIR); $(setup_env) $(kpkg_header) configure
 	touch $@
 
-binary-dummy:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
+install-base:
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -242,6 +238,13 @@
 	dh_md5sums
 	dh_builddeb
 
+install-dummy:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	$(MAKE) -f debian/rules.real install-base
+
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(VERSION)
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: $(STAMPS_DIR)/source
@@ -254,13 +257,12 @@
 install-source: $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2
 	dh_testdir
 	dh_testroot
-	dh_install $< /usr/src
-	dh_installdocs README
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_install $(DH_OPTIONS) $< /usr/src
+	dh_installdocs $(DH_OPTIONS) README
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
 
+install-tree: DH_OPTIONS = -plinux-tree-$(VERSION)
+install-tree:
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS=$(DH_OPTIONS)
+