From ab2b82e3c2e34f95d37c971a119c2438c65afbc7 Mon Sep 17 00:00:00 2001 From: "michael.hudson@canonical.com" Date: Sat, 24 Jan 2026 10:24:35 +1300 Subject: [PATCH] a more generic way to make sure all artefacts get a for-iso path --- live-build/auto/build | 5 ++++- live-build/lb_binary_layered | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 4a8adfb7..066f7041 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -580,7 +580,10 @@ if [ "${MAKE_ISO}" = "yes" ]; then # the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes # "for-iso.kernel-generic". for thing in ${PREFIX}.kernel-* ${PREFIX}.initrd-*; do - ln $thing for-iso${thing#${PREFIX}} + for_iso_path=for-iso${thing#${PREFIX}} + if [ ! -f $for_iso_path ]; then + ln -v $thing $for_iso_path + fi done isobuild add-live-filesystem --artifact-prefix for-iso. isobuild make-bootable --project "${PROJECT}" --capproject "$(cat config/iso-ids/capproject)" \ diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered index efcbfdb7..e6e8d49d 100755 --- a/live-build/lb_binary_layered +++ b/live-build/lb_binary_layered @@ -195,8 +195,6 @@ build_layered_squashfs () { isobuild generate-sources --mountpoint=/cdrom > ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources create_squashfs "${overlay_dir}" ${PWD}/for-iso.${pass}.squashfs rm ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources - else - ln ${squashfs_f} ${PWD}/for-iso.${pass}.squashfs fi if [ -f config/$pass.catalog-in.yaml ]; then @@ -241,3 +239,11 @@ if [ -n "$(ls livecd.${PROJECT_FULL}.*install.live.manifest.full 2>/dev/null)" ] fi chmod 644 *.squashfs *.manifest* *.size + +prefix=livecd.${PROJECT_FULL} +for artifact in ${prefix}.*; do + for_iso_path=for-iso${artifact#${prefix}} + if [ ! -f $for_iso_path ]; then + ln -v $artifact $for_iso_path + fi +done