From 66e5f97cc14d68095798f6753a110de38a455990 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 10 Aug 2011 13:14:25 +0200 Subject: [PATCH] Import patches-unapplied version 2.21 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: 9ea613db8f08b03694923e94ad874c77afb5b037 New changelog entries: * make sure ac100 images have universe enabled since the kernel lives there. --- debian/changelog | 6 ++++++ live-build/auto/config | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 38e6d63f..9972a491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.21) oneiric; urgency=low + + * make sure ac100 images have universe enabled since the kernel lives there. + + -- Oliver Grawert Wed, 10 Aug 2011 13:14:25 +0200 + livecd-rootfs (2.20) oneiric; urgency=low * make sure the right packages are installed on armel+ac100 subarch builds diff --git a/live-build/auto/config b/live-build/auto/config index 23789e7f..59d1e220 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -198,6 +198,7 @@ case $ARCH in BINARY_REMOVE_LINUX=false ;; ac100) + COMPONENTS='main restricted universe' add_package install abootimg linux-ac100 flash-kernel BINARY_REMOVE_LINUX=false ;;