From edaab1def3d2b5bed0e6a3fcc06fba3918c592a2 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Fri, 20 Nov 2020 12:36:23 -0800 Subject: [PATCH] Omit file type exensions in manifest names --- live-build/buildd/hooks/50-buildd-tar.binary | 2 +- live-build/buildd/hooks/51-buildd-lxd.binary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary index 88947a07..738e5f9a 100755 --- a/live-build/buildd/hooks/50-buildd-tar.binary +++ b/live-build/buildd/hooks/50-buildd-tar.binary @@ -6,7 +6,7 @@ set -e . config/functions -create_manifest chroot "livecd.$PROJECT.rootfs.tar.gz.manifest" +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. diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary index d0ff69a6..85daa72a 100755 --- a/live-build/buildd/hooks/51-buildd-lxd.binary +++ b/live-build/buildd/hooks/51-buildd-lxd.binary @@ -11,7 +11,7 @@ config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \ tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml rm -rf "$TMPDIR" -create_manifest chroot "livecd.$PROJECT.lxd.tar.manifest" +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/.