From b660991a76e6015e09fc42933a918654c245e41a Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 29 Jan 2013 12:35:51 -0700 Subject: [PATCH] * Add abootimg explicitly to ac100 and nexus7 images, so it's marked as manually installed and apt doesn't autoremove it (LP: #1041290) * Remove linux-firmware-nexus7 from the install list, it gets pulled in automatically by linux-image-nexus7, so this is redundant. --- debian/changelog | 11 +++++++++-- live-build/auto/config | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 927c84e4..762c170c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -livecd-rootfs (2.108) UNRELEASED; urgency=low +livecd-rootfs (2.108) raring; urgency=low + [ Colin Watson ] * live-build/auto/build: Use slightly safer code for kernel handling just in case 'set -o pipefail' is ever reinstated here. - -- Colin Watson Mon, 07 Jan 2013 21:24:13 +0000 + [ Adam Conrad ] + * Add abootimg explicitly to ac100 and nexus7 images, so it's marked + as manually installed and apt doesn't autoremove it (LP: #1041290) + * Remove linux-firmware-nexus7 from the install list, it gets pulled + in automatically by linux-image-nexus7, so this is redundant. + + -- Adam Conrad Tue, 29 Jan 2013 12:34:37 -0700 livecd-rootfs (2.107) raring; urgency=low diff --git a/live-build/auto/config b/live-build/auto/config index 55e07707..bbb5b315 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -298,13 +298,14 @@ case $ARCH in ;; ac100) COMPONENTS='main restricted universe multiverse' - add_package install zram-config + add_package install zram-config abootimg add_package live ac100-tarball-installer BINARY_REMOVE_LINUX=false ;; nexus7) COMPONENTS='main restricted universe multiverse' - add_package install zram-config linux-firmware-nexus7 nvidia-tegra3 ubuntu-defaults-nexus7 + add_package install zram-config abootimg + add_package install nvidia-tegra3 ubuntu-defaults-nexus7 add_package live ac100-tarball-installer BINARY_REMOVE_LINUX=false mkdir -p config/preseed