From 28192903523e9b2ee1a1249b1d9ac742a7585b1e Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Tue, 23 Oct 2018 10:32:52 -0700 Subject: [PATCH] Changed absoluted paths to relative; set changelog message to UNRELEASED --- debian/changelog | 2 +- live-build/auto/build | 2 +- live-build/functions | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa58e031..d605af52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.543) cosmic; urgency=medium +livecd-rootfs (2.543) UNRELEASED; urgency=medium * Ensure pre-seeded snaps are now published in the image manifests. diff --git a/live-build/auto/build b/live-build/auto/build index 4e23dccd..86a269c5 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -551,7 +551,7 @@ fi # '--initramfs none' produces different manifest names. if [ -e "binary/$INITFS/filesystem.packages" ]; then - /build/config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages" + ./config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages" ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest" chmod 644 "$PREFIX.manifest" fi diff --git a/live-build/functions b/live-build/functions index bd84c242..9f4f02fd 100644 --- a/live-build/functions +++ b/live-build/functions @@ -49,7 +49,7 @@ create_manifest() { 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." - /build/config/snap-seed-parse "${chroot_root}" >> ${target_file} + ./config/snap-seed-parse "${chroot_root}" >> ${target_file} echo "create_manifest call to snap_seed_parse finished." echo "create_manifest finished" }