From 5bee1ade70b3c2ee57ae47e4bcda3438ea2e2de2 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Mon, 22 Oct 2018 10:21:50 -0700 Subject: [PATCH 1/2] Ensure pre-seeded snaps are now published in the image manifests. --- debian/changelog | 6 ++ live-build/auto/build | 1 + live-build/auto/config | 1 + live-build/functions | 11 ++++ live-build/snap-seed-parse.py | 56 +++++++++++++++++++ .../hooks/031-0-create-root-dir.binary | 2 +- .../hooks/030-root-squashfs.binary | 2 +- 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100755 live-build/snap-seed-parse.py diff --git a/debian/changelog b/debian/changelog index 50ee1908..fa58e031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.543) cosmic; urgency=medium + + * Ensure pre-seeded snaps are now published in the image manifests. + + -- Cody Shepherd Mon, 22 Oct 2018 10:16:19 -0700 + livecd-rootfs (2.542) cosmic; urgency=medium * Decide what model assertion series to fetch depending on the suite. Use 16 diff --git a/live-build/auto/build b/live-build/auto/build index 4b6fdc2e..4e23dccd 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -551,6 +551,7 @@ fi # '--initramfs none' produces different manifest names. if [ -e "binary/$INITFS/filesystem.packages" ]; then + /build/config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages" ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest" chmod 644 "$PREFIX.manifest" fi diff --git a/live-build/auto/config b/live-build/auto/config index 75fd11aa..bffbb7f7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -33,6 +33,7 @@ fi mkdir -p config cp -af /usr/share/livecd-rootfs/live-build/functions config/functions +cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse mkdir -p config/package-lists diff --git a/live-build/functions b/live-build/functions index cf68ba16..bd84c242 100644 --- a/live-build/functions +++ b/live-build/functions @@ -43,6 +43,17 @@ create_empty_disk_image() { dd if=/dev/zero of="$1" bs=1 count=0 seek="${imagesize}" } +create_manifest() { + local chroot_root=${1} + local target_file=${2} + echo "create_manifest chroot_root: ${chroot_root}" + dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file} + echo "create_manifest call to dpkg-query finished." + /build/config/snap-seed-parse "${chroot_root}" >> ${target_file} + echo "create_manifest call to snap_seed_parse finished." + echo "create_manifest finished" +} + make_ext4_partition() { device="$1" label=${fs_label:+-L "${fs_label}"} diff --git a/live-build/snap-seed-parse.py b/live-build/snap-seed-parse.py new file mode 100755 index 00000000..c441dc5a --- /dev/null +++ b/live-build/snap-seed-parse.py @@ -0,0 +1,56 @@ +#!/usr/bin/python3 + +""" +Usage: snap-seed-parse ${chroot_dir} > somefile.manifest + +This script looks for a seed.yaml path in the given root directory, parsing +it and printing generated manifest lines to stdout for easy redirection. +""" + +import re +import sys +import yaml +import os.path + + +def log(msg): + sys.stderr.write("snap-seed-parse: {}\n".format(msg)) + + +log("Parsing seed.yaml") + +CHROOT_ROOT = sys.argv[1] if len(sys.argv) > 1 and len(sys.argv[1]) > 0 \ + else '' + +# Trim any trailing slashes for correct appending +log("CHROOT_ROOT: {}".format(CHROOT_ROOT)) +if len(CHROOT_ROOT) > 0 and CHROOT_ROOT[-1] == '/': + CHROOT_ROOT = CHROOT_ROOT[:-1] + +# This is where we expect to find the seed.yaml file +YAML_PATH = CHROOT_ROOT + '/var/lib/snapd/seed/seed.yaml' + +# Snaps are prepended with this string in the manifest +LINE_PREFIX = 'snap:' + +log("yaml path: {}".format(YAML_PATH)) +if not os.path.isfile(YAML_PATH): + log("WARNING: yaml path not found; no seeded snaps found.") + exit(0) +else: + log("yaml path found.") + +with open(YAML_PATH, 'r') as fh: + yaml_lines = yaml.safe_load(fh)['snaps'] + +# Loop over dict items, outputting one manifest line from each triplet +for item in yaml_lines: + filestring = item['file'] + # Pull the revision number off the file name + revision = filestring[filestring.rindex('_')+1:] + revision = re.sub(r'[^0-9]', '', revision) + print("{}{}\t{}\t{}".format(LINE_PREFIX, + item['name'], + item['channel'], + revision, + )) 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 a4d77bd7..6ba4fe9c 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 @@ -26,4 +26,4 @@ mkdir -p $rootfs_dir/lib/modules teardown_mountpoint $rootfs_dir -dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest +create_manifest "${rootfs_dir}" "${rootfs_dir}.manifest" diff --git a/live-build/ubuntu-server/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary index ad34e76a..41c15001 100755 --- a/live-build/ubuntu-server/hooks/030-root-squashfs.binary +++ b/live-build/ubuntu-server/hooks/030-root-squashfs.binary @@ -28,7 +28,7 @@ cp -a chroot/* binary/boot/squashfs.dir squashfs_f="${PWD}/livecd.${PROJECT}.squashfs" squashfs_f_manifest="${squashfs_f}.manifest" -dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest} +create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}" (cd "binary/boot/squashfs.dir/" && mksquashfs . ${squashfs_f} \ From 28192903523e9b2ee1a1249b1d9ac742a7585b1e Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Tue, 23 Oct 2018 10:32:52 -0700 Subject: [PATCH 2/2] Changed absoluted paths to relative; set changelog message to UNRELEASED --- debian/changelog | 2 +- live-build/auto/build | 2 +- live-build/functions | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa58e031..d605af52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.543) cosmic; urgency=medium +livecd-rootfs (2.543) UNRELEASED; urgency=medium * Ensure pre-seeded snaps are now published in the image manifests. diff --git a/live-build/auto/build b/live-build/auto/build index 4e23dccd..86a269c5 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -551,7 +551,7 @@ fi # '--initramfs none' produces different manifest names. if [ -e "binary/$INITFS/filesystem.packages" ]; then - /build/config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages" + ./config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages" ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest" chmod 644 "$PREFIX.manifest" fi diff --git a/live-build/functions b/live-build/functions index bd84c242..9f4f02fd 100644 --- a/live-build/functions +++ b/live-build/functions @@ -49,7 +49,7 @@ create_manifest() { echo "create_manifest chroot_root: ${chroot_root}" dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file} echo "create_manifest call to dpkg-query finished." - /build/config/snap-seed-parse "${chroot_root}" >> ${target_file} + ./config/snap-seed-parse "${chroot_root}" >> ${target_file} echo "create_manifest call to snap_seed_parse finished." echo "create_manifest finished" }