From fdd9a3e7160ba21b85cc46e61c383e1ab62ffe1b Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Sun, 17 Jan 2016 01:06:56 +0100 Subject: [PATCH 1/2] Remove unneeded packages from the root.tar.{gz,xz} cloud image targets (LP: #1534765). --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2cbf2077..6d67eb71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.371) xenial; urgency=medium + + * Remove unneeded packages from the root.tar.{gz,xz} cloud image targets + (LP: #1534765). + + -- utlemming Howard Sun, 17 Jan 2016 01:04:09 +0100 + livecd-rootfs (2.370) xenial; urgency=medium * Produce OVA files for i386 cloud builds. 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 100755 --- 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 From 8ff658da8d36d0bc166e435647b8c01e0c66bbf0 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 18 Jan 2016 19:58:50 -0700 Subject: [PATCH 2/2] Remove unneeded packages from the root.tar.{gz,xz} cloud image targets (LP: #1534764). --- debian/changelog | 2 +- live-build/ubuntu-cpc/hooks/999-extras.binary | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d67eb71..1237ab28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ livecd-rootfs (2.371) xenial; urgency=medium * Remove unneeded packages from the root.tar.{gz,xz} cloud image targets - (LP: #1534765). + (LP: #1534764). -- utlemming Howard Sun, 17 Jan 2016 01:04:09 +0100 diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary index 155a3b12..dad116a0 100755 --- 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}