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

[Bastian Blank]

Author: waldi
Date: 2005-08-08 12:41:11 +0000 (Mon, 08 Aug 2005)
New Revision: 3737

Modified:
   people/waldi/kernel/source/linux-2.6/debian/Makefile
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules
Log:
* debian/Makefile: Don't call extra binary targets.
* debian/bin/gencontrol.py: Update.
* debian/rules
  - Add debian/bin/gencontrol.py to prequisites of debian/control.
  - Add debian/control to prequisites of build to avoid builds with an out
    of date control file.
  - Call extra binary targets.


Modified: people/waldi/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-08 12:06:37 UTC (rev 3736)
+++ people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-08 12:41:11 UTC (rev 3737)
@@ -120,7 +120,6 @@
 binary-indep: build
 binary-arch: build headers-stamp $(istamps)
 	mv *.deb ../..
-	$(MAKE) -f Makefile.inc binary-$(DEB_BUILD_ARCH)
 
 install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
 	cp -al $< install-$*;

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-08 12:06:37 UTC (rev 3736)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 12:41:11 UTC (rev 3737)
@@ -372,7 +372,7 @@
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
                 rule = []
                 for i in dummy_packages:
-                    rule.append("cd ..; $(MAKE) -f debian/Makefile binary-dummy PACKAGE=%s" % i['Package'])
+                    rule.append("$(MAKE) -f debian/Makefile binary-dummy PACKAGE=%s" % i['Package'])
                 makefile.append(("binary-%s-%s-%s:" % (arch, subarch_text, flavour), rule))
 
     write_control(packages)

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 12:06:37 UTC (rev 3736)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 12:41:11 UTC (rev 3737)
@@ -7,7 +7,9 @@
 # Generally nothing needs to be modified below this line
 #
 SHELL    := sh -e
-karch    := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+karch    := $(DEB_BUILD_ARCH)
 srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version  := $(word 1,$(subst -, ,$(srcver)))
 ltver    := $(word 2,$(subst -, ,$(srcver)))
@@ -180,7 +182,7 @@
 	ln -s $$(command -v touch) debian/bin/touch.orig
 	touch debian/unpack-stamp
 
-build: debian/build-stamp
+build: debian/control debian/build-stamp
 debian/build-stamp: debian/unpack-stamp
 	dh_testdir
 	cd debian; 			\
@@ -218,6 +220,7 @@
 	for i in $(subarchs); do	\
 	  $(MAKE) subarch=$${i} binary;	\
 	done
+	$(MAKE) -f debian/Makefile.inc binary-$(DEB_BUILD_ARCH)
 
 binary:	binary-indep binary-arch
 
@@ -225,7 +228,7 @@
 # Makes the master debian/control file by substituting
 # variable values into the template.
 #
-debian/control: debian/changelog $(wildcard debian/templates/control.*.in)
+debian/control: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
 	debian/bin/gencontrol.py
 	@echo
 	@echo This target is made to fail intentionally, to make sure