r2472 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian

[Sven Luther]

Author: luther
Date: 2005-02-10 09:04:43 +0100 (Thu, 10 Feb 2005)
New Revision: 2472

Added:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.prerm
Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/dirs-image.m4
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules
Log:
Modified bootloader.postinst to only do the mkvmlinuz stuff for now.
Added a bootloader.prerm to also erase the mkvmlinuz made vmlinuz kernel.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst	2005-02-10 07:47:42 UTC (rev 2471)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst	2005-02-10 08:04:43 UTC (rev 2472)
@@ -40,22 +40,28 @@
 db_get kernel-image-powerpc/bootloaders
 bootloader="$RET"
 
-# If mkvmlinuz is chosen, we invoke it
-case "$bootloader" in
-    yaboot)
-	db_input medium kernel-image-powerpc/bootloaders-yaboot || true
-	db_go
-	;;
-    quik)
-	db_input medium kernel-image-powerpc/bootloaders-quik || true
-	db_go
-	;;
-    mkvmlinuz)
-    	/usr/sbin/mkvmlinuz $1 $2
-	;;
-    *)
-	db_subst kernel-image-powerpc/bootloaders-unknown "$arch"
-	db_input medium kernel-image-powerpc/bootloaders-unknown || true
-	db_go
-	;;
-esac
+if [ "$bootloader" = mkvmlinuz ]; then
+    /usr/sbin/mkvmlinuz $1 $2
+fi
+
+# Disabled now, but this will end in a generic bootloader calling code,
+# including the code to copy the kernel to the prep partition, and to 
+# tell the user which firmware variables to set.
+#case "$bootloader" in
+#    yaboot)
+#	db_input medium kernel-image-powerpc/bootloaders-yaboot || true
+#	db_go
+#	;;
+#    quik)
+#	db_input medium kernel-image-powerpc/bootloaders-quik || true
+#	db_go
+#	;;
+#    mkvmlinuz)
+#    	/usr/sbin/mkvmlinuz $1 $2
+#	;;
+#    *)
+#	db_subst kernel-image-powerpc/bootloaders-unknown "$arch"
+#	db_input medium kernel-image-powerpc/bootloaders-unknown || true
+#	db_go
+#	;;
+#esac

Copied: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.prerm (from rev 2469, trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst)
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst	2005-02-09 12:19:25 UTC (rev 2469)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.prerm	2005-02-10 08:04:43 UTC (rev 2472)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_get kernel-image-powerpc/bootloaders
+bootloader="$RET"
+
+# Let's erase the kernel created by mkvmlinuz too.
+if [ "$bootloader" = mkvmlinuz ]; then
+    rm $2/vmlinuz-$1
+fi

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/dirs-image.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/dirs-image.m4	2005-02-10 07:47:42 UTC (rev 2471)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/dirs-image.m4	2005-02-10 08:04:43 UTC (rev 2472)
@@ -1 +1,2 @@
 etc/kernel/postinst.d/M4KERNEL-M4FLAVOUR
+etc/kernel/prerm.d/M4KERNEL-M4FLAVOUR

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules	2005-02-10 07:47:42 UTC (rev 2471)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules	2005-02-10 08:04:43 UTC (rev 2472)
@@ -228,6 +228,8 @@
 # copy bootloader scripts to /etc/kernel/postinst.d and templates too.
 	$(INSTALL_EXEC) debian/bootloader.postinst	\
 		$(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour)/bootloader
+	$(INSTALL_EXEC) debian/bootloader.postinst	\
+		$(KIMAGE)/etc/kernel/prerm.d/$(kernel)-$(flavour)/bootloader
 	$(INSTALL_DATA) debian/bootloader.templates $(KIMAGE)/DEBIAN/templates
 
 # add a README file