From 576f7638e414f10ff6fb189dfea06482b067c213 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 27 Feb 2008 20:19:16 +0000 Subject: [PATCH] Import patches-unapplied version 0.55 to ubuntu/hardy Imported using git-ubuntu import. Changelog parent: 7fd846a27f960f308d8446ddb03edcf6aab33790 New changelog entries: * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels now. --- debian/changelog | 7 +++++++ livecd.sh | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 55310caa..eaee130f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.55) hardy; urgency=low + + * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels + now. + + -- Colin Watson Wed, 27 Feb 2008 20:19:16 +0000 + livecd-rootfs (0.54) hardy; urgency=low * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate. diff --git a/livecd.sh b/livecd.sh index d7622bff..2db2b45e 100755 --- a/livecd.sh +++ b/livecd.sh @@ -296,15 +296,11 @@ link_in_boot = $link_in_boot ubuntu-lpia) LIST="$LIST linux-lpia";; *) LIST="$LIST linux-generic";; esac;; - powerpc) - case $SUBARCH in - ps3) LIST="$LIST linux-cell";; - *) LIST="$LIST linux-powerpc linux-powerpc64-smp";; - esac;; # and the bastard stepchildren ia64) LIST="$LIST linux-itanium linux-mckinley";; hppa) LIST="$LIST linux-hppa32 linux-hppa64";; + powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; sparc*) LIST="$LIST linux-sparc64";; *) echo "Unknown architecture: no kernel."; exit 1;; esac