From 9ea613db8f08b03694923e94ad874c77afb5b037 Mon Sep 17 00:00:00 2001 From: Oliver Grawert <ogra@ubuntu.com> Date: Tue, 9 Aug 2011 16:25:11 +0200 Subject: [PATCH] Import patches-unapplied version 2.20 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: d67d517c3aaba67f0f66f77439587210440a9bfd New changelog entries: * make sure the right packages are installed on armel+ac100 subarch builds --- debian/changelog | 6 ++++++ live-build/auto/config | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 530d7451..38e6d63f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.20) oneiric; urgency=low + + * make sure the right packages are installed on armel+ac100 subarch builds + + -- Oliver Grawert <ogra@ubuntu.com> Tue, 09 Aug 2011 16:25:11 +0200 + livecd-rootfs (2.19) oneiric; urgency=low * Add support for building a pool of packages into the live config: diff --git a/live-build/auto/config b/live-build/auto/config index fc85468e..23789e7f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -197,6 +197,10 @@ case $ARCH in add_package install x-loader-omap4-panda u-boot-linaro-omap4-panda BINARY_REMOVE_LINUX=false ;; + ac100) + add_package install abootimg linux-ac100 flash-kernel + BINARY_REMOVE_LINUX=false + ;; esac ;; esac