Merge branch from NCommander, after fixing his changelog

ubuntu/precise
Steve Kowalik 16 years ago
commit 3cda67fce0

5
debian/changelog vendored

@ -1,5 +1,10 @@
livecd-rootfs (0.89) UNRELEASED; 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 <stevenk@ubuntu.com> Wed, 05 Aug 2009 20:32:19 +1000

@ -325,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

Loading…
Cancel
Save