From 4ec61627a8213593e079e41db4bbf15e7d4c6567 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 18 Nov 2020 14:22:57 -0800 Subject: [PATCH] Create manifests for buildd tarballs --- live-build/buildd/hooks/50-buildd-tar.binary | 4 ++++ live-build/buildd/hooks/51-buildd-lxd.binary | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary index c9c4663a..88947a07 100755 --- a/live-build/buildd/hooks/50-buildd-tar.binary +++ b/live-build/buildd/hooks/50-buildd-tar.binary @@ -4,6 +4,10 @@ # ourselves. set -e +. config/functions + +create_manifest chroot "livecd.$PROJECT.rootfs.tar.gz.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,^chroot,chroot-autobuild,' --sort=name --numeric-owner \ diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary index 44b38213..d0ff69a6 100755 --- a/live-build/buildd/hooks/51-buildd-lxd.binary +++ b/live-build/buildd/hooks/51-buildd-lxd.binary @@ -3,12 +3,16 @@ 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.tar.manifest" + # When using the combined metadata/rootfs form, the rootfs must be under # rootfs/ rather than under chroot-autobuild/. tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \