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

[Sven Luther]

Author: luther
Date: 2005-03-03 08:47:27 +0100 (Thu, 03 Mar 2005)
New Revision: 2584

Modified:
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Now unpack the kernel-image and kernel-headers pre/post inst/rm script too.


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-03-03 05:50:08 UTC (rev 2583)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-03-03 07:47:27 UTC (rev 2584)
@@ -153,7 +153,7 @@
 	$(M4) debian/control-flavour-$(arch)-$(subarch)-$(flavour).m4 >> $(KFLAVOUR)/debian/control
 	rm -f $(KFLAVOUR)/.config
 	-$(MAKE) -s -C config $(flavour) > $(KFLAVOUR)/.config
-ifeq (powerpc,$(flavours))
+ifeq (powerpc,$(subarch))
 	cd debian; cp -p post-install $(KFLAVOUR)/debian
 endif
 	touch $@
@@ -270,6 +270,7 @@
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
 	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(subarch) kernel-image
+	dpkg -e $(KDUMMYSA) $(KIMAGESA)/DEBIAN
 	dpkg -x $(KDUMMYSA) $(KIMAGESA)
 
 	# copy build infrastructure for kernel modules
@@ -296,6 +297,7 @@
 	$(INSTALL_EXEC) debian/unpatch-$(subarch) $(KPATCH)/unpatch/0$(subarch)
 
 stamp-install-headers-subarch-$(subarch):
+	dpkg -e $(KHEADERS) $(KHEADERDIR)/DEBIAN
 	dpkg -x $(KHEADERS) $(KHEADERDIR)
 
 stamp-install-flavour-$(subarch)-%:
@@ -311,6 +313,7 @@
 	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
 	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
 	$(MAKEKPKG) --subarch $(makekpkg) --append-to-version -$(flavour) kernel-image
+	dpkg -e $(KDUMMY) $(KIMAGE)/DEBIAN
 	dpkg -x $(KDUMMY) $(KIMAGE)
 
 	# remove the coff image