From 128aaa8bb3f718e43f86ab5213623be305351d3c Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 28 Aug 2020 00:54:17 +0000 Subject: [PATCH] Imported 2.686 No reason for CPC update specified. --- debian/changelog | 11 +++++++++++ debian/control | 2 +- get-ppa-fingerprint | 8 +++----- live-build/auto/config | 1 + live-build/functions | 11 +++++++++++ live-build/squashfs-exclude-files | 1 + .../ubuntu-cpc/hooks.d/base/root-squashfs.binary | 9 +++++---- .../ubuntu-server/hooks/030-root-squashfs.binary | 4 +--- .../ubuntu-server/hooks/032-installer-squashfs.binary | 4 +--- 9 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 live-build/squashfs-exclude-files diff --git a/debian/changelog b/debian/changelog index 4b6589cd..6d96fb29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +livecd-rootfs (2.686) groovy; urgency=medium + + [ Dan Streetman ] + * use python3-launchpadlib directly instead of python3-software-properties + + [ Steve Langasek ] + * Restore the removal of fstab from squashfs images, now that cloud-init + has been fixed (LP: #1877078; ref bug #1890803) + + -- Steve Langasek Thu, 27 Aug 2020 08:53:31 -0700 + livecd-rootfs (2.685) groovy; urgency=medium * Revert 'ubuntu-cpc: Disable boot splash in all cloud images diff --git a/debian/control b/debian/control index 8025b061..dbcc6375 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Depends: ${misc:Depends}, procps, python3, python3-apt, - python3-software-properties, + python3-launchpadlib, python3-yaml, qemu-utils [!i386 !riscv64], rsync, diff --git a/get-ppa-fingerprint b/get-ppa-fingerprint index f6910419..1450362f 100755 --- a/get-ppa-fingerprint +++ b/get-ppa-fingerprint @@ -2,16 +2,14 @@ from __future__ import print_function +from launchpadlib.launchpad import Launchpad from optparse import OptionParser -from softwareproperties import ppa - parser = OptionParser(usage="%prog OWNER/NAME") _, args = parser.parse_args() if not args: parser.error("must provide a PPA owner/name") owner_name, ppa_name = args[0].split("/", 1) -owner_name = "~%s" % owner_name -ppa_info = ppa.get_ppa_info_from_lp(owner_name, ppa_name) -print(ppa_info["signing_key_fingerprint"]) +lp = Launchpad.login_anonymously('livecd-rootfs') +print(lp.people(owner_name).getPPAByName(name=ppa_name).signing_key_fingerprint) diff --git a/live-build/auto/config b/live-build/auto/config index 9935d24f..89e25277 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -35,6 +35,7 @@ mkdir -p config cp -af /usr/share/livecd-rootfs/live-build/functions config/functions cp -af /usr/share/livecd-rootfs/live-build/lb_*_layered config/ cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse +cp -af /usr/share/livecd-rootfs/live-build/squashfs-exclude-files config/ mkdir -p config/package-lists diff --git a/live-build/functions b/live-build/functions index e9d06d22..e4b90425 100644 --- a/live-build/functions +++ b/live-build/functions @@ -289,6 +289,17 @@ create_vmdk() { rm -rf ${scratch_d} } +create_squashfs() { + local config_dir rootfs_dir squashfs_file + rootfs_dir="$1" + squashfs_file="$2" + config_dir="$PWD/config" + (cd $rootfs_dir && + mksquashfs . $squashfs_file -no-progress -xattrs -comp xz \ + -ef "$config_dir/squashfs-exclude-files") + +} + create_derivative() { # arg1 is the disk type # arg2 is the new name diff --git a/live-build/squashfs-exclude-files b/live-build/squashfs-exclude-files new file mode 100644 index 00000000..bcdcb274 --- /dev/null +++ b/live-build/squashfs-exclude-files @@ -0,0 +1 @@ +etc/fstab diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary index 873cee59..bc56bc42 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary @@ -8,14 +8,15 @@ if [ -n "$SUBARCH" ]; then exit 0 fi +. config/functions + # This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" cp $rootfs_dir.manifest $squashfs_f.manifest -cp $rootfs_dir.filelist $squashfs_f.filelist +# fstab is omitted from the squashfs +grep -v '^/etc/fstab$' $rootfs_dir.filelist >$squashfs_f.filelist -(cd $rootfs_dir && - mksquashfs . $squashfs_f \ - -no-progress -xattrs -comp xz ) +create_squashfs $rootfs_dir $squashfs_f diff --git a/live-build/ubuntu-server/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary index 41c15001..148490e9 100755 --- a/live-build/ubuntu-server/hooks/030-root-squashfs.binary +++ b/live-build/ubuntu-server/hooks/030-root-squashfs.binary @@ -30,6 +30,4 @@ squashfs_f_manifest="${squashfs_f}.manifest" create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}" -(cd "binary/boot/squashfs.dir/" && - mksquashfs . ${squashfs_f} \ - -no-progress -xattrs -comp xz ) +create_squashfs "binary/boot/squashfs.dir/" ${squashfs_f} diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index c12c8bf1..a86deb35 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -91,6 +91,4 @@ find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" -(cd "$OVERLAY_ROOT/" && - mksquashfs . ${squashfs_f} \ - -no-progress -xattrs -comp xz ) +create_squashfs "$OVERLAY_ROOT/" ${squashfs_f}