r2561 - trunk/utils/mkvmlinuz/mkvmlinuz/debian

[Sven Luther]

Author: luther
Date: 2005-02-25 17:39:14 +0100 (Fri, 25 Feb 2005)
New Revision: 2561

Added:
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure
Removed:
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/config
Modified:
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
   trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
Log:
Doing the debconf thing correctly this time.


Deleted: trunk/utils/mkvmlinuz/mkvmlinuz/debian/config
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/config	2005-02-25 13:52:25 UTC (rev 2560)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/config	2005-02-25 16:39:14 UTC (rev 2561)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-case $(grep ^machine /proc/cpuinfo) in
-    *PReP*Blackhawk*) arch=ppcbug ;;
-    *PReP*) arch=prep ;;
-    *CHRP*Pegasos*) arch=chrp_pegasos ;;
-    *CHRP*) arch=chrp ;;
-    *Amiga*) arch=apus ;;
-    *iSeries*) arch=iseries ;;
-    *)
-	case $(grep ^pmac-generation /proc/cpuinfo) in
-	    *NewWorld) arch=pmac_newworld ;;
-	    *OldWorld) arch=pmac_oldworld ;;
-	    *NuBus) arch=pmac_nubus ;;
-	    *) arch=unknown ;;
-	esac
-	;;
-esac
-
-# List of bootloader per subarch.
-case $arch in
-    chrp|pmac_newworld) bootloaders="yaboot, mkvmlinuz" ;;
-    pmac_oldworld) bootloaders="quik, mkvmlinuz" ;;
-    ppcbug|prep|chrp_pegasos) bootloaders="mkvmlinuz" ;;
-    *) bootloaders="unknown" ;;
-esac
-
-# If there is more than one bootloader present, ask the user
-# at medium priority
-
-db_subst kernel-image-powerpc/bootloaders choices "$bootloaders"
-db_subst kernel-image-powerpc/bootloaders default "${bootloaders%, *}"
-db_input medium kernel-image-powerpc/bootloaders || true
-db_go || true

Copied: trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure (from rev 2559, trunk/utils/mkvmlinuz/mkvmlinuz/debian/config)

Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs	2005-02-25 13:52:25 UTC (rev 2560)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs	2005-02-25 16:39:14 UTC (rev 2561)
@@ -1,3 +1,5 @@
 etc/mkvmlinuz
 usr/sbin
-usr/share/man/man8
\ No newline at end of file
+usr/share/man/man8
+etc/kernel/postinst.d
+etc/kernel/postrm.d

Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst	2005-02-25 13:52:25 UTC (rev 2560)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst	2005-02-25 16:39:14 UTC (rev 2561)
@@ -2,6 +2,8 @@
 
 set -e
 
+. /usr/share/debconf/confmodule
+
 db_get kernel-image-powerpc/bootloaders
 bootloader="$RET"
 

Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm	2005-02-25 13:52:25 UTC (rev 2560)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm	2005-02-25 16:39:14 UTC (rev 2561)
@@ -10,7 +10,7 @@
 # Let's erase the kernel created by mkvmlinuz too.
 if [ "$bootloader" = mkvmlinuz ]; then
     vmlinuz=`echo $2 | sed -e 's/vmlinux/vmlinuz/'`
-    rm $vmlinuz
+    rm -f $vmlinuz
     if [ -e "$vmlinuz.old" ]; then
 	mv $vmlinuz.old $vmlinuz
     fi

Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	2005-02-25 13:52:25 UTC (rev 2560)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	2005-02-25 16:39:14 UTC (rev 2561)
@@ -40,8 +40,8 @@
 	dh_installdirs
 
 	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/tmp/usr/sbin
-	$(INSTALL_EXEC) kernel-image.postinst $(CURDIR)/debian/tmp/etc/kernel/postinst.d/mkvmlinuz
-	$(INSTALL_EXEC) kernel-image.postrm $(CURDIR)/debian/tmp/etc/kernel/postrm.d/mkvmlinuz
+	$(INSTALL_EXEC) debian/kernel-image.postinst $(CURDIR)/debian/tmp/etc/kernel/postinst.d/mkvmlinuz
+	$(INSTALL_EXEC) debian/kernel-image.postrm $(CURDIR)/debian/tmp/etc/kernel/postrm.d/mkvmlinuz
 	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/tmp/usr/sbin
 	$(INSTALL_DATA) mkvmlinuz.8 $(CURDIR)/debian/tmp/usr/share/man/man8
 	$(INSTALL_DATA) output $(CURDIR)/debian/tmp/etc/mkvmlinuz
@@ -57,6 +57,7 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installman
+	dh_installdebconf
 	dh_compress
 	dh_fixperms
 	dh_installdeb