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

[Bastian Blank]

Author: waldi
Date: 2005-08-10 13:41:30 +0000 (Wed, 10 Aug 2005)
New Revision: 3823

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: Fix typos.
* debian/rules.real
  - Move doc package rules from debian/rules.
  - Fix some installation 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 13:11:24 UTC (rev 3822)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 13:41:30 UTC (rev 3823)
@@ -358,11 +358,11 @@
                 makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
 
             subarch_makeflags = arch_makeflags + " SUBARCH='%s' ABINAME='-%s'" % (subarch_text, subarch_vars['abiname'])
-            cmds_binary = []
-            cmds_binary.append(("$(MAKE) -f debian/rules.real binary-subarch %s" % subarch_makeflags,))
+            cmds_binary_arch = []
+            cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % subarch_makeflags,))
             cmds_setup = []
             cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % subarch_makeflags,))
-            makefile.append(("binary-%s-%s-real:" % (arch, subarch_text), cmds_binary))
+            makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch_text), cmds_binary_arch))
             makefile.append(("setup-%s-%s-real:" % (arch, subarch_text), cmds_setup))
 
             flavour_list = arches[arch][subarch].keys()

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:11:24 UTC (rev 3822)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:41:30 UTC (rev 3823)
@@ -69,27 +69,6 @@
 	dh_md5sums -p$(ppkg)
 	dh_builddeb -p$(ppkg)
 	touch debian/patch-debian-stamp
-#
-# linux-doc package
-#
-dbdir := debian/build-doc
-dbddir := $(dbdir)/debian
-doc: debian/doc-stamp
-debian/doc-stamp: debian/patch-stamp
-	dh_testdir
-	dh_testroot
-#	Create a build tree
-	mkdir -p $(dbdir)
-	cp -al $(source_files) $(dbdir)
-	mkdir -p $(dbddir)
-	cp debian/changelog $(dbddir)
-	cp debian/control   $(dbddir)
-	cp debian/copyright $(dbddir)
-	touch $(dbddir)/official
-	cd $(dbdir) && make-kpkg --stem linux kernel-doc
-	cat $(dbddir)/files >> debian/files
-	mv debian/*.deb ..
-	touch debian/doc-stamp
 
 setup: debian/setup-stamp
 debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR)

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 13:11:24 UTC (rev 3822)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 13:41:30 UTC (rev 3823)
@@ -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 install-tree
+binary-indep: install-doc install-source install-tree
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
@@ -89,13 +89,14 @@
 setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
 setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/$@
 install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	rm -rf $(DIR)
-	cp -al build-$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	cd $(DIR); $(setup_env) $(kpkg_image) kernel-image
 	cat $(DIR)/debian/files >> files
-	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
+	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
 	rm -rf $(DIR)
 
 install-header-subarch-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
@@ -105,7 +106,7 @@
 	cp -al $(SOURCE_DIR) $(DIR)
 	cd $(DIR); $(setup_env) $(kpkg_header) kernel-headers
 	cat $(DIR)/debian/files >> files
-	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
+	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
 	rm -rf $(DIR)
 
 $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/header-install.in
@@ -238,6 +239,21 @@
 	dh_md5sums
 	dh_builddeb
 
+install-doc: SOURCE_DIR=$(BUILD_DIR)/source
+install-doc: DIR=$(BUILD_DIR)/$@
+install-doc: $(STAMPS_DIR)/source
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
+	mkdir -p $(DIR)/debian
+	cp debian/changelog $(DIR)/debian
+	cp debian/copyright $(DIR)/debian
+	cp debian/control $(DIR)/debian/control
+	touch $(DIR)/debian/official
+	cd $(DIR) && $(setup_env) make-kpkg --stem linux kernel-doc
+	cat $(DIR)/debian/files >> files
+	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
+	rm -rf $(DIR)
+
 install-dummy:
 	dh_testdir
 	dh_testroot