r2572 - trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian

[Sven Luther]

Author: luther
Date: 2005-02-26 13:17:41 +0100 (Sat, 26 Feb 2005)
New Revision: 2572

Modified:
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Fixed a few missing dependencies in debian/rules.
Forced make-kpkg --rootcmd fakeroot option, since apparently dpkg-buildpackage doesn't pass it down.


Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-02-26 10:59:47 UTC (rev 2571)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-02-26 12:17:41 UTC (rev 2572)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#!/usr/bin/make -f 
 
 # debian/rules for kernel-patch-powerpc
 
@@ -65,7 +65,9 @@
 export PARALLEL_BUILD=-j2
 export INITRD=Yes
 export INITRD_OK=WeKnowWhatWeAreDoing
-#export KPKG_SUBARCH=pmac
+# Don't know why i have to force this here, apparently make-kpkg doesn't 
+# get passed the -r command of the dpkg-buildpackage invocation :/
+MAKEKPKG=make-kpkg --rootcmd fakeroot
 
 # the configure target is responsible for setting up the build arena,
 # i.e. unpacking the Debian kernel source, applying the PowerPC patch,
@@ -170,6 +172,7 @@
 endif
 
 stamp-build: \
+stamp-configure \
 stamp-build-$(arch) \
 $(foreach subarch,$(subarchs),stamp-build-subarch-$(subarch))
 	touch $@
@@ -193,13 +196,13 @@
 	cd $(KSUBARCH); \
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
-	make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) kernel_headers
+	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(subarch) kernel_headers
 ifeq (,$(flavours))
 	# Let's build subarches who have no flavours here.
 	cd $(KSUBARCH); \
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
-	make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) build
+	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(subarch) build
 endif
 	touch $@
 
@@ -214,7 +217,7 @@
 	cd $(KFLAVOUR); \
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
-	make-kpkg --subarch $(makekpkg) --append-to-version -$(flavour) build
+	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(flavour) build
 	touch $@
 
 endif
@@ -233,6 +236,8 @@
 install: stamp-install
 
 stamp-install: \
+stamp-configure \
+stamp-build \
 stamp-install-$(arch) \
 $(foreach subarch,$(subarchs),stamp-install-subarch-$(subarch))
 	touch $@
@@ -263,7 +268,7 @@
 	cd $(KSUBARCH); \
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
-	make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) kernel-image
+	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(subarch) kernel-image
 	dpkg -x $(KDUMMYSA) $(KIMAGESA)
 
 	# copy build infrastructure for kernel modules
@@ -304,7 +309,7 @@
 	cd $(KFLAVOUR); \
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
-	make-kpkg --subarch $(makekpkg) --append-to-version -$(flavour) kernel-image
+	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(flavour) kernel-image
 	dpkg -x $(KDUMMY) $(KIMAGE)
 
 	# remove the coff image
@@ -328,7 +333,7 @@
 endif
 
 ifeq ($(DEB_HOST_ARCH),powerpc)
-binary: configure build install
+binary: stamp-configure stamp-build stamp-install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
@@ -366,7 +371,7 @@
 
 	dh_clean
 
-.PHONY:	configure build install binary binary-arch clean
+.PHONY:	configure build install binary clean
 
 # this target is intended for easy upgrade of the control file, in
 # case the kernel version, the Debian revision, or the flavours