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

[Sven Luther]

Author: luther
Date: 2005-03-03 12:15:12 +0100 (Thu, 03 Mar 2005)
New Revision: 2587

Modified:
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Copied the postinst files. Should close #297794.


Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog	2005-03-03 07:53:15 UTC (rev 2586)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog	2005-03-03 11:15:12 UTC (rev 2587)
@@ -1,6 +1,7 @@
 kernel-patch-powerpc-2.4.27 (2.4.27-4) unstable; urgency=low
 
   * Seems 2.4.27-3 had missing postinst and co script, fixed it.
+    (Closes: #297794)
 
  -- Sven Luther <luther@debian.org>  Thu,  3 Mar 2005 08:48:44 +0100
 

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 07:53:15 UTC (rev 2586)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-03-03 11:15:12 UTC (rev 2587)
@@ -40,9 +40,11 @@
 KSOURCE	 = $(TMP)/kernel-source-$(kernel)
 KSUBARCH = $(TMP)/kernel-source-$(kernel)-$(subarch)
 KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(subarch)-$(flavour)
-KDUMMYSA   = $(TMP)/kernel-image-$(kernel)-$(subarch)_$(version)_powerpc.deb
+KDUMMYSA = $(TMP)/kernel-image-$(kernel)-$(subarch)_$(version)_powerpc.deb
 KDUMMY   = $(TMP)/kernel-image-$(kernel)-$(flavour)_$(version)_powerpc.deb
 KHEADERS = $(TMP)/kernel-headers-$(kernel)-$(subarch)_$(version)_powerpc.deb
+KSCRIPTS = $(TMP)/scripts/$(flavour)
+KSCRIPTSA= $(TMP)/scripts/$(subarch)
 
 # install locations
 KHEADERDIR = $(CURDIR)/debian/kernel-headers-$(kernel)-$(subarch)
@@ -270,8 +272,9 @@
 	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)
+	mkdir -p $(KSCRIPTSA)/DEBIAN
+	dpkg -e $(KDUMMYSA) $(KSCRIPTSA)/DEBIAN
 
 	# copy build infrastructure for kernel modules
 	cd $(KSUBARCH); find scripts -type f ! -name '*.o' | cpio -pd $(KSRCSA)
@@ -297,8 +300,9 @@
 	$(INSTALL_EXEC) debian/unpatch-$(subarch) $(KPATCH)/unpatch/0$(subarch)
 
 stamp-install-headers-subarch-$(subarch):
-	dpkg -e $(KHEADERS) $(KHEADERDIR)/DEBIAN
 	dpkg -x $(KHEADERS) $(KHEADERDIR)
+	mkdir -p $(KSCRIPTSA)/DEBIAN-HEADER
+	dpkg -e $(KHEADERS) $(KSCRIPTSA)/DEBIAN-HEADER
 
 stamp-install-flavour-$(subarch)-%:
 	$(MAKE) -f debian/rules stamp-install-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
@@ -313,8 +317,9 @@
 	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)
+	mkdir -p $(KSCRIPTS)/DEBIAN
+	dpkg -e $(KDUMMY) $(KSCRIPTS)/DEBIAN
 
 	# remove the coff image
 	rm -f $(KIMAGE)/boot/vmlinux.coff-$(kernel)-$(flavour)
@@ -349,6 +354,12 @@
 	dh_strip -a
 	dh_fixperms -a
 	dh_installdeb -a
+	for p in apus nubus powerpc powerpc-smp powerpc-small; do \
+		cp $(TMP)/scripts/$$p/DEBIAN/p* $(CURDIR)/debian/kernel-image-$(kernel)-$$p/DEBIAN; \
+	done
+	for p in $(subarchs); do \
+		cp $(TMP)/scripts/$$p/DEBIAN-HEADER/p* $(CURDIR)/debian/kernel-headers-$(kernel)-$$p/DEBIAN; \
+	done
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a