From 9276498a1ae222e88ac7f3fa00abf82ad0ce7c0a Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 5 Aug 2009 14:20:37 +0100 Subject: [PATCH] Import patches-unapplied version 0.89 to ubuntu/karmic Imported using git-ubuntu import. Changelog parent: 4b16ae8f92b1e71ce78dd89c19190cd7128c2ccd New changelog entries: [ Michael Casadevall ] * Move armel to subarchitectures so we can support dove . * Made armel with no subarch default to imx51. [ Steve Kowalik ] * livecd.sh: Stop building UNR from universe. --- debian/changelog | 11 +++++++++++ livecd.sh | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdb77449..8f3895df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +livecd-rootfs (0.89) karmic; urgency=low + + [ Michael Casadevall ] + * Move armel to subarchitectures so we can support dove . + * Made armel with no subarch default to imx51. + + [ Steve Kowalik ] + * livecd.sh: Stop building UNR from universe. + + -- Steve Kowalik Wed, 05 Aug 2009 14:20:37 +0100 + livecd-rootfs (0.88) karmic; urgency=low [ Adam Conrad ] diff --git a/livecd.sh b/livecd.sh index 47285469..33a1dabe 100755 --- a/livecd.sh +++ b/livecd.sh @@ -210,7 +210,6 @@ Flags: seen ubuntu-netbook-remix) LIST="$LIST minimal^ standard^ ubuntu-netbook-remix^" LIVELIST="unr-live^ casper ubiquity" - COMP="main restricted universe" ;; mythbuntu) LIST="$LIST minimal^ standard^ mythbuntu-desktop^ mythbuntu-desktop" @@ -326,7 +325,12 @@ link_in_boot = $link_in_boot hppa) LIST="$LIST linux-hppa32 linux-hppa64";; powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; sparc*) LIST="$LIST linux-sparc64";; - armel) LIST="$LIST linux-imx51";; + armel) + case "$SUBARCH" in + imx51) LIST="$LIST linux-imx51";; + dove) LIST="$LIST linux-dove";; + *) LIST="$LIST linux-imx51";; + esac;; *) echo "Unknown architecture: no kernel."; exit 1;; esac