r2537 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian
Sven Luther
luther@costa.debian.org
Wed, 23 Feb 2005 13:39:18 +0100
Author: luther
Date: 2005-02-23 13:39:17 +0100 (Wed, 23 Feb 2005)
New Revision: 2537
Removed:
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.postrm
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.templates
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules
Log:
Removed again bootloader magic for now.
Deleted: 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-23 06:21:29 UTC (rev 2536)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postinst 2005-02-23 12:39:17 UTC (rev 2537)
@@ -1,67 +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 [ "$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
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postrm
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postrm 2005-02-23 06:21:29 UTC (rev 2536)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.postrm 2005-02-23 12:39:17 UTC (rev 2537)
@@ -1,17 +0,0 @@
-#!/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
- vmlinuz=`echo $2 | sed -e 's/vmlinux/vmlinuz/'`
- rm $vmlinuz
- if [ -e "$vmlinuz.old" ]; then
- mv $vmlinuz.old $vmlinuz
- fi
-fi
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.templates
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.templates 2005-02-23 06:21:29 UTC (rev 2536)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/bootloader.templates 2005-02-23 12:39:17 UTC (rev 2537)
@@ -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/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog 2005-02-23 06:21:29 UTC (rev 2536)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog 2005-02-23 12:39:17 UTC (rev 2537)
@@ -1,3 +1,10 @@
+kernel-patch-powerpc-2.6.10 (2.6.10-3) unstable; urgency=high
+
+ * Removed again the bootloader postinst boot magic, as it caused bad
+ interaction between make-kpkg and debconf. (Sven Luther)
+
+ -- Sven Luther <luther@debian.org> Wed, 23 Feb 2005 13:29:23 +0100
+
kernel-patch-powerpc-2.6.10 (2.6.10-2) unstable; urgency=high
* Added kernel postinst magic to be sure we do the right thing in the
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-23 06:21:29 UTC (rev 2536)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/rules 2005-02-23 12:39:17 UTC (rev 2537)
@@ -225,18 +225,6 @@
cd $(KFLAVOUR); find scripts -type f ! -name '*.o' | cpio -pd $(KSRC)
cat debian/build-files | ( cd $(KFLAVOUR); cpio -pd $(KSRC) )
-# copy bootloader scripts to /etc/kernel/postinst.d and templates too.
- test -d $(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour) \
- || mkdir -p $(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour)
- $(INSTALL_EXEC) debian/bootloader.postinst \
- $(KIMAGE)/etc/kernel/postinst.d/$(kernel)-$(flavour)/bootloader
- test -d $(KIMAGE)/etc/kernel/postrm.d/$(kernel)-$(flavour) \
- || mkdir -p $(KIMAGE)/etc/kernel/postrm.d/$(kernel)-$(flavour)
- $(INSTALL_EXEC) debian/bootloader.postrm \
- $(KIMAGE)/etc/kernel/postrm.d/$(kernel)-$(flavour)/bootloader
- test -d $(KIMAGE)/DEBIAN || mkdir -p $(KIMAGE)/DEBIAN
- $(INSTALL_DATA) debian/bootloader.templates $(KIMAGE)/DEBIAN/templates
-
# add a README file
mkdir -p $(KBUILDDOC)
$(INSTALL_DATA) debian/README.kernel-build $(KBUILDDOC)/README.Debian