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

[Sven Luther]

Author: luther
Date: 2005-02-09 10:24:59 +0100 (Wed, 09 Feb 2005)
New Revision: 2468

Added:
   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.templates
Removed:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates
Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules
Log:
Renamed mkvmlinuz magic script to bootloader, to make it more generic.


Copied: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst (from rev 2467, trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst)

Copied: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.templates (from rev 2467, trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates)

Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst	2005-02-09 09:21:40 UTC (rev 2467)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst	2005-02-09 09:24:59 UTC (rev 2468)
@@ -1,61 +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|iseries) 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
-
-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/mkvmlinux $1 $2
-	;;
-    *)
-	db_subst kernel-image-powerpc/bootloaders-unknown "$arch"
-	db_input medium kernel-image-powerpc/bootloaders-unknown || true
-	db_go
-	;;
-esac

Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates	2005-02-09 09:21:40 UTC (rev 2467)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates	2005-02-09 09:24:59 UTC (rev 2468)
@@ -1,23 +0,0 @@
-Template: kernel-image-powerpc/bootloaders
-Type: select
-Choices: ${choices}
-Default: ${default}
-Description: select your bootloader
- Your PowerPC arch supports more than one bootloader, 
- please chose the one you want to use.
-
-Template: kernel-image-powerpc/bootloaders-yaboot
-Type: note
-Description: please call yaboot by hand
- No logic yet to call yaboot directly, please do it by hand.
-
-Template: kernel-image-powerpc/bootloaders-quik
-Type: note
-Description: please call quik by hand
- No logic yet to call quik directly, please do it by hand.
-
-Template: kernel-image-powerpc/bootloaders-unknown
-Type: note
-Description: no bootloader method for ${arch}
- No known bootloader method for PowerPC subarch ${arch}.
-

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-09 09:21:40 UTC (rev 2467)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules	2005-02-09 09:24:59 UTC (rev 2468)
@@ -225,9 +225,9 @@
 	cat debian/build-files | ( cd $(KFLAVOUR); cpio -pd $(KSRC) )
 
 # copy bootloader scripts to /etc/kernel/postinst.d and templates too.
-	$(INSTALL_EXEC) debian/mkvmlinuz.postinst	\
-		$(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour)/mkvmlinuz
-	$(INSTALL_DATA) debian/mkvmlinuz.templates $(KIMAGE)/DEBIAN/templates
+	$(INSTALL_EXEC) debian/bootloader.postinst	\
+		$(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour)/bootloader
+	$(INSTALL_DATA) debian/bootloader.templates $(KIMAGE)/DEBIAN/templates
 
 # add a README file
 	mkdir -p $(KBUILDDOC)