[neon/neon/livecd-rootfs/Neon/release-lts] live-build/buildd/hooks: Omit file type exensions in manifest names

Cody Shepherd null at kde.org
Fri Mar 12 10:45:26 GMT 2021


Git commit ff91fd7da487a4dadaf6f0c49b6af6022fc69879 by Cody Shepherd.
Committed on 03/02/2021 at 15:27.
Pushed by jriddell into branch 'Neon/release-lts'.

Omit file type exensions in manifest names

M  +1    -1    live-build/buildd/hooks/50-buildd-tar.binary
M  +1    -1    live-build/buildd/hooks/51-buildd-lxd.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/ff91fd7da487a4dadaf6f0c49b6af6022fc69879

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/.



More information about the Neon-commits mailing list