Bug#386265: base-installer patch for prep support.
tags 386265 + patch
thanks
Hi,
Find attached a patch which chose a -prep kernel on prep boxes, and also
removed apus support, since we currently have no apus kernels.
I would appreciate a review of this one, to see if i didn't make a mistake
that may affect other stuff.
This patch also includes a /proc/cpuinfo output of my powerstack II, for
addition into the kernel choser testing infrastructure.
Friendly,
Sven Luther
Index: powerpc.sh
===================================================================
--- powerpc.sh (revision 42783)
+++ powerpc.sh (working copy)
@@ -9,7 +9,8 @@
;;
esac
case "$SUBARCH" in
- powermac*|prep|chrp*) echo "$family" ;;
+ powermac*|chrp*) echo "$family" ;;
+ prep) echo prep ;;
amiga) echo apus ;;
*)
warning "Unknown $ARCH subarchitecture '$SUBARCH'."
@@ -31,34 +32,26 @@
}
arch_get_kernel () {
- # The APUS kernels are in a separate source package, so may
- # sometimes have a different version number.
- apusversion=2.4.27
-
CPUS="$(grep -ci ^processor "$CPUINFO")" || CPUS=1
- if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && [ "$1" != "powerpc64" ]; then
+ if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && [ "$1" != "powerpc64" ] && [ "$1" != "prep" ] ; then
SMP=-smp
else
SMP=
fi
- case "$1" in
- apus) echo "kernel-image-$apusversion-apus" ;;
+ case "$KERNEL_MAJOR" in
+ 2.6)
+ if [ "$SMP" ]; then
+ echo "linux-image-$KERNEL_MAJOR-$1$SMP"
+ fi
+ echo "linux-image-$KERNEL_MAJOR-$1"
+ ;;
*)
- case "$KERNEL_MAJOR" in
- 2.6)
- if [ "$SMP" ]; then
- echo "linux-image-$KERNEL_MAJOR-$1$SMP"
- fi
- echo "linux-image-$KERNEL_MAJOR-$1"
- ;;
- *)
- if [ "$1" = powerpc ] && [ "$SMP" ]; then
- # 2.4 only has powerpc-smp.
- echo "kernel-image-$KERNEL_MAJOR-$1$SMP"
- fi
- echo "kernel-image-$KERNEL_MAJOR-$1"
- ;;
- esac
+ if [ "$1" = powerpc ] && [ "$SMP" ]; then
+ # 2.4 only has powerpc-smp.
+ echo "kernel-image-$KERNEL_MAJOR-$1$SMP"
+ fi
+ echo "kernel-image-$KERNEL_MAJOR-$1"
+ ;;
esac
}
processor : 0
cpu : 604r
clock : ???
revision : 49.2 (pvr 0009 3102)
bogomips : 299.00
machine : PReP Utah (Powerstack II Pro4000)
l2 cache : 512KiB, parity disabled SRAM:synchronous, pipelined, no parity
Reply to: