Merge tarball-transform into ubuntu/xenial [a=codyshepherd] [r=rcj,vorlon]

Bring tarball and rootfs hooks in line with bionic+, and allow for ext4 image format to be built without breaking tarballs. LP: #1863024

MP: https://code.launchpad.net/~codyshepherd/livecd-rootfs/+git/livecd-rootfs/+merge/392066

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.408.62) UNRELEASED; urgency=medium
+
+  [ Cody Shepherd ]
+  * buildd: ext4: change tar transform target to match changes in bionic+
+  * buildd: Skip jasper for buildd subproject
+  * buildd: Create manifests for buildd tarballs
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Fri, 20 Nov 2020 15:23:31 -0600
+
 livecd-rootfs (2.408.61) xenial; urgency=medium
 
   * SRU: Enable bootable-buildd hooks for Xenial (LP: #1863024)

live-build/auto/config

@@ -135,8 +135,10 @@ case $IMAGEFORMAT in
 				COMPONENTS='main restricted universe multiverse'
 				;;
 			*)
-				case $PROJECT in
-					ubuntu-cpc)
+				case $PROJECT:${SUBPROJECT:-} in
+					ubuntu-base:buildd)
+						;;
+					ubuntu-cpc:*)
 						;;
 					*)
 						add_package live jasper

live-build/buildd/hooks/50-buildd-tar.binary

@@ -4,7 +4,11 @@
 # ourselves.
 set -e
 
+. config/functions
+
+create_manifest chroot "livecd.$PROJECT.rootfs.manifest"
+
 # gzip was chosen for fastest decompression speed: it decompresses 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 \
-	-czf "livecd.$PROJECT.rootfs.tar.gz" binary
+tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \
+	-czf "livecd.$PROJECT.rootfs.tar.gz" chroot

live-build/buildd/hooks/51-buildd-lxd.binary

@@ -3,14 +3,18 @@
 set -e
 
 . config/bootstrap
+. config/functions
 
 TMPDIR="$(mktemp -d)"
 config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \
 	>"$TMPDIR/metadata.yaml"
 tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml
 rm -rf "$TMPDIR"
+
+create_manifest chroot "livecd.$PROJECT.lxd.manifest"
+
 # When using the combined metadata/rootfs form, the rootfs must be under
 # rootfs/ rather than under chroot-autobuild/.
-tar --transform='s,^binary,rootfs,' --sort=name --numeric-owner \
-	-rf "livecd.$PROJECT.lxd.tar" binary
+tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \
+	-rf "livecd.$PROJECT.lxd.tar" chroot
 gzip -9 "livecd.$PROJECT.lxd.tar"