From 4bb325f10748a6b3fa4216f1136331ab3ac52760 Mon Sep 17 00:00:00 2001 From: CPC Jenkins Date: Tue, 25 Sep 2018 20:46:41 +0000 Subject: [PATCH] Imported 2.540 No reason for CPC update specified. --- debian/changelog | 13 +++++++++++++ live-build/auto/build | 2 +- .../ubuntu-cpc/hooks/031-0-create-root-dir.binary | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8ae7b4a1..e9695751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.540) cosmic; urgency=medium + + * Ensure /lib/modules exists in root tarballs and sqashfs. + (LP: #1792905) + + -- Tobias Koch Thu, 20 Sep 2018 09:38:34 +0200 + +livecd-rootfs (2.539) cosmic; urgency=medium + + * Stop building buildd chroots with --xattrs until we move to python3. + + -- Adam Conrad Thu, 20 Sep 2018 02:52:10 -0600 + livecd-rootfs (2.538) cosmic; urgency=medium * Add a buildd subproject. diff --git a/live-build/auto/build b/live-build/auto/build index 9d901bc7..70088cf1 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -505,7 +505,7 @@ elif [ "$SUBPROJECT" = buildd ]; then # buildd chroots about twice as fast as xz and about five times as # fast as bzip2. tar --transform='s,^binary,chroot-autobuild,' \ - --sort=name --numeric-owner --xattrs \ + --sort=name --numeric-owner \ -czf "$PREFIX.rootfs.tar.gz" binary fi diff --git a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary index 9a916658..a4d77bd7 100755 --- a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary +++ b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary @@ -21,6 +21,9 @@ env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get --purge remove --a env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes rm -rf $rootfs_dir/boot/grub +# Keep this as some derivatives mount a tempfs here +mkdir -p $rootfs_dir/lib/modules + teardown_mountpoint $rootfs_dir dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest