From 6f6fb2834b9d13a11bcb4a80baf827af784e019b Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Mon, 22 Feb 2016 11:31:01 +0000 Subject: [PATCH] Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which is used outside of the livecd-rootfs build process (specifically for EC2 publication). --- debian/changelog | 8 ++++++++ live-build/auto/config | 10 ++++++++-- live-build/ubuntu-cpc/hooks/030-root-tarball.binary | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 066a02c7..43105f51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.380) UNRELEASED; urgency=medium + + * Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which + is used outside of the livecd-rootfs build process (specifically for EC2 + publication). + + -- Daniel Watkins Mon, 22 Feb 2016 11:29:26 +0000 + livecd-rootfs (2.379) xenial; urgency=medium * add /var/lib/systemd/rfkill to pre-created dirs to use as writable diff --git a/live-build/auto/config b/live-build/auto/config index 0935826c..a471a680 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -103,7 +103,7 @@ add_binary_hook () case $PROJECT in ubuntu-cpc) - IMAGEFORMAT=plain + IMAGEFORMAT=ext4 ;; esac @@ -117,7 +117,13 @@ case $IMAGEFORMAT in COMPONENTS='main restricted universe multiverse' ;; *) - add_package live jasper + case $PROJECT in + ubuntu-cpc) + ;; + *) + add_package live jasper + ;; + esac ;; esac ;; diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary index 28d920ce..f3e1c9e5 100755 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary @@ -7,6 +7,9 @@ fi . /build/config/functions +mkdir binary/boot/filesystem.dir +cp -a chroot/* binary/boot/filesystem.dir + setup_mountpoint binary/boot/filesystem.dir chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe