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

[Bastian Blank]

Author: waldi
Date: 2005-08-10 12:56:58 +0000 (Wed, 10 Aug 2005)
New Revision: 3821

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 binary-indep.
* debian/rules.real: Move source 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:40:10 UTC (rev 3820)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 12:56:58 UTC (rev 3821)
@@ -317,6 +317,11 @@
     image = read_template("image")
     image_latest = read_template("image.latest")
 
+    makeflags = "VERSION='%s' SOURCE_VERSION='%s'" % (version, source_version)
+    cmds_binary_indep = []
+    cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags,))
+    makefile.append(("binary-indep:", cmds_binary_indep))
+
     arch_list = arches.keys()
     arch_list.sort()
     for arch in arch_list:
@@ -327,7 +332,7 @@
         for i in (('setup',)):
             makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
 
-        arch_makeflags = "VERSION='%s' SOURCE_VERSION='%s' ARCH='%s'" % (version, source_version, arch)
+        arch_makeflags = makeflags + " ARCH='%s'" % arch
         cmds_setup = []
         cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % arch_makeflags,))
         makefile.append(("setup-%s-real:" % arch, cmds_setup))
@@ -346,7 +351,7 @@
                 subarch_text = 'none'
                 subarch_vars['subarch'] = ''
 
-            for i in ('binary-arch', 'binary-indep', 'build', 'setup'):
+            for i in ('binary-arch', 'build', 'setup'):
                 makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
                 makefile.append(("%s-%s-%s::" % (i, arch, subarch_text), None))
             for i in ('binary-arch', 'setup'):
@@ -380,10 +385,8 @@
                 packages.append(process_package(headers[0], flavour_vars))
                 packages.extend(dummy_packages)
 
-                for i in ('binary-arch', 'binary-indep', 'build', 'setup'):
+                for i in ('binary-arch', 'build', 'setup'):
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
-                    makefile.append(("%s-%s-%s-%s::" % (i, arch, subarch_text, flavour), None))
-                for i in ('binary-arch', 'build', 'setup'):
                     makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
 
                 flavour_makeflags = subarch_makeflags + " FLAVOUR='%s'" % flavour

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:40:10 UTC (rev 3820)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:56:58 UTC (rev 3821)
@@ -26,30 +26,6 @@
 include debian/rules.defs
 
 #
-# linux-source package
-#
-spkg := linux-source-$(version)
-sdir := debian/$(spkg)/usr/src
-source: debian/source-stamp
-debian/source-stamp: debian/patch-stamp
-	dh_testdir
-	dh_testroot
-	dh_installdirs -p$(spkg) /usr/src
-#	Link the files and create a tarball in correct location
-	mkdir $(spkg)
-	cp -al $(source_files) $(spkg)
-	tar -cjf $(sdir)/$(spkg).tar.bz2 $(spkg)
-	rm -rf $(spkg)
-	dh_installdocs -p$(spkg) README
-	dh_installchangelogs -p$(spkg)
-	dh_compress -p$(spkg)
-	dh_fixperms -p$(spkg)
-	dh_installdeb -p$(spkg)
-	dh_gencontrol -p$(spkg)
-	dh_md5sums -p$(spkg)
-	dh_builddeb -p$(spkg)
-	touch debian/source-stamp
-#
 # linux-tree package
 #
 tpkg := linux-tree-$(version)
@@ -167,9 +143,9 @@
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
-binary-indep: source tree patch-debian doc
+binary-indep:
 	dh_testdir
-	$(MAKE) -f debian/rules.gen binary-indep-$(DEB_HOST_ARCH)
+	$(MAKE) -f debian/rules.gen binary-indep
 
 binary-arch:
 	dh_testdir

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:40:10 UTC (rev 3820)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:56:58 UTC (rev 3821)
@@ -81,6 +81,8 @@
 binary-arch-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+binary-indep: install-source
+
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 setup-arch: $(STAMPS_DIR)/source
@@ -240,3 +242,25 @@
 	dh_md5sums
 	dh_builddeb
 
+$(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
+	rm -rf $@ $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
+	cd $(BUILD_DIR); tar -cjf linux-source-$(VERSION).tar.bz2 linux-source-$(VERSION)
+	rm -rf $(DIR)
+
+install-source: DH_OPTIONS = -plinux-source-$(VERSION)
+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
+