From 97112cf5a4361d9202fe7668f02962b61f4c5add Mon Sep 17 00:00:00 2001 From: Michael Casadevall Date: Tue, 4 Aug 2009 10:52:12 -0400 Subject: [PATCH 1/2] Move armel boards to subarchitecture and add dove armel subarchitecture --- livecd.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/livecd.sh b/livecd.sh index 47285469..518004da 100755 --- a/livecd.sh +++ b/livecd.sh @@ -326,7 +326,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";; + *) echo "Unknown armel subarch: no kernel." exit 1;; + esac;; *) echo "Unknown architecture: no kernel."; exit 1;; esac From c858daa68dec670b05cbf5ed2c515b487ad0089b Mon Sep 17 00:00:00 2001 From: Michael Casadevall Date: Wed, 5 Aug 2009 07:04:47 -0400 Subject: [PATCH 2/2] Move armel to subarchitectures so we can support dove and subarchitecture. Made armel with no subarch default to imx51 --- debian/changelog | 7 +++++++ livecd.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bdb77449..f86bdb93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.88ubuntu1) karmic; urgency=low + + * Move armel to subarchitectures so we can support dove and + subarchitecture. Made armel with no subarch default to imx51 + + -- Michael Casadevall Wed, 05 Aug 2009 07:00:26 -0400 + livecd-rootfs (0.88) karmic; urgency=low [ Adam Conrad ] diff --git a/livecd.sh b/livecd.sh index 518004da..336338d2 100755 --- a/livecd.sh +++ b/livecd.sh @@ -330,7 +330,7 @@ link_in_boot = $link_in_boot case "$SUBARCH" in imx51) LIST="$LIST linux-imx51";; dove) LIST="$LIST linux-dove";; - *) echo "Unknown armel subarch: no kernel." exit 1;; + *) LIST="$LIST linux-imx51";; esac;; *) echo "Unknown architecture: no kernel."; exit 1;; esac