From fd9a4dc0ba3e1a0d46c70a9804f52bca69724315 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 25 May 2017 20:35:22 -0500 Subject: [PATCH] ubuntu-cpc: Remove unneeded packages from the root.tar.{gz,xz} (LP: #1534764) --- debian/changelog | 8 ++++++++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary | 1 + live-build/ubuntu-cpc/hooks/999-extras.binary | 7 ++----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 55d56e26..b82f5ddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.209.7) trusty; urgency=medium + + [Ben Howard] + * Remove unneeded packages from the root.tar.{gz,xz} cloud image targets + (LP: #1534764). + + -- Robert C Jennings Tue, 23 May 2017 20:45:47 -0500 + livecd-rootfs (2.209.6) trusty; urgency=medium [Daniel Watkins] diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary index 22556399..6e6f183a 100644 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary @@ -15,6 +15,7 @@ chroot binary/boot/filesystem.dir chmod +x /usr/sbin/grub-probe env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*' +env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary index 155a3b12..dad116a0 100644 --- a/live-build/ubuntu-cpc/hooks/999-extras.binary +++ b/live-build/ubuntu-cpc/hooks/999-extras.binary @@ -11,8 +11,5 @@ fi # Export the common functions to the extras . /build/config/functions -# Execute extra binary hooks -for recipe in $(find ${extra_d} -type f -executable -maxdepth 1); -do - bash -xue ${recipe} -done +# Cleaner execution +/bin/run-parts ${extra_d}