Merge lp:~codyshepherd/livecd-rootfs/bionic-proposed-snaps-manifest into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

[Cody Shepherd]

Backport inclusion of snaps in image manifests. LP: #1805497.

Backport inclusion of snaps in image manifests. LP: #1805497.

[lp:~codyshepherd/livecd-rootfs/bionic-proposed-snaps-manifest]

1692. By Cody Shepherd on 2018-11-27

Adding snap-seed-parse.py (that might help)

1693. By Cody Shepherd on 2018-11-27

Adding bug number to changelog.

[Dan Watkins (oddbloke)]

review: Approve

[Robert C Jennings (rcj)]

Nice clean backport, looking forward to having this for the build system

review: Approve

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-11-26 20:55:29 +0000
+++ debian/changelog	2018-11-27 19:53:09 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.525.10ubuntu3) UNRELEASED; urgency=medium
+
+  * Include snaps in image manifests (LP: #1805497)
+  * Change call to add grub efi packages using new create_manifests()
+    function.
+
+ -- Cody Shepherd <[e-mail]>  Tue, 27 Nov 2018 11:51:32 -0800
+
 livecd-rootfs (2.525.10) bionic; urgency=medium
 
   [ Cody Shepherd ]
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-08-27 22:32:07 +0000
+++ live-build/auto/build	2018-11-27 19:53:09 +0000
@@ -503,6 +503,7 @@
 
 # '--initramfs none' produces different manifest names.
 if [ -e "binary/$INITFS/filesystem.packages" ]; then
+    ./config/snap-seed-parse "chroot/" "binary/${INITFS}/filesystem.packages"
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
 	chmod 644 "$PREFIX.manifest"
 fi
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-10-24 19:18:36 +0000
+++ live-build/auto/config	2018-11-27 19:53:09 +0000
@@ -33,6 +33,7 @@
 
 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
 
 
=== modified file 'live-build/functions'
--- live-build/functions	2018-04-19 00:01:40 +0000
+++ live-build/functions	2018-11-27 19:53:09 +0000
@@ -43,6 +43,17 @@
     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."
+    ./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}"}
 
=== added file 'live-build/snap-seed-parse.py'
--- live-build/snap-seed-parse.py	1970-01-01 00:00:00 +0000
+++ live-build/snap-seed-parse.py	2018-11-27 19:53:09 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/python3
+ 
+"""
+Usage: snap-seed-parse [${chroot_dir}] <output file>
+ 
+This script looks for a seed.yaml path in the given root directory, parsing
+it and appending the parsed lines to the given output file.
+ 
+The $chroot_dir argument is optional and will default to the empty string.
+"""
+ 
+import argparse
+import os.path
+import re
+import yaml
+ 
+ 
+def log(msg):
+    print("snap-seed-parse: {}".format(msg))
+ 
+ 
+log("Parsing seed.yaml")
+ 
+parser = argparse.ArgumentParser()
+parser.add_argument('chroot', nargs='?', default='',
+                    help='root dir for the chroot from which to generate the '
+                         'manifest')
+parser.add_argument('file', help='Output manifest to this file')
+ 
+ARGS = parser.parse_args()
+CHROOT_ROOT = ARGS.chroot
+FNAME = ARGS.file
+ 
+# 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']
+ 
+log('Writing manifest to {}'.format(FNAME))
+ 
+with open(FNAME, 'a+') as fh:
+    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)
+        fh.write("{}{}\t{}\t{}\n".format(LINE_PREFIX,
+                                         item['name'],
+                                         item['channel'],
+                                         revision,
+                                         ))
+log('Manifest output finished.')
 
=== modified file 'live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary'
--- live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary	2018-09-20 11:43:39 +0000
+++ live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary	2018-11-27 19:53:09 +0000
@@ -26,4 +26,4 @@
 
 teardown_mountpoint $rootfs_dir
 
-dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest
+create_manifest "${rootfs_dir}" "${rootfs_dir}.manifest"
 
=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-10-25 16:22:46 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-11-27 19:53:09 +0000
@@ -97,7 +97,7 @@
     # grub-efi packages that otherwise would not make it into the base
     # manifest. filesystem.packages is moved into place via symlinking to
     # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
-    dpkg-query --show --admindir="mountpoint/var/lib/dpkg" > "binary/boot/filesystem.packages"
+    create_manifest "mountpoint" "binary/boot/filesystem.packages"
 
     chroot mountpoint grub-install "${loop_device}" \
         --boot-directory=/boot \
 
=== modified file 'live-build/ubuntu-server/hooks/030-root-squashfs.binary'
--- live-build/ubuntu-server/hooks/030-root-squashfs.binary	2017-06-14 16:25:11 +0000
+++ live-build/ubuntu-server/hooks/030-root-squashfs.binary	2018-11-27 19:53:09 +0000
@@ -28,7 +28,7 @@
 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} \