Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-04-14 13:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

a more generic way to make sure all artefacts get a for-iso path

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-01-24 10:24:35 +13:00
parent 9a9ca07a76
commit ab2b82e3c2
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live-build/auto/build
View File

@ -580,7 +580,10 @@ if [ "${MAKE_ISO}" = "yes" ]; then
# the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes # the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes
# "for-iso.kernel-generic". # "for-iso.kernel-generic".
for thing in ${PREFIX}.kernel-* ${PREFIX}.initrd-*; do 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 done
isobuild add-live-filesystem --artifact-prefix for-iso. isobuild add-live-filesystem --artifact-prefix for-iso.
isobuild make-bootable --project "${PROJECT}" --capproject "$(cat config/iso-ids/capproject)" \ isobuild make-bootable --project "${PROJECT}" --capproject "$(cat config/iso-ids/capproject)" \

10
live-build/lb_binary_layered
View File

@ -195,8 +195,6 @@ build_layered_squashfs () {
isobuild generate-sources --mountpoint=/cdrom > ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources isobuild generate-sources --mountpoint=/cdrom > ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources
create_squashfs "${overlay_dir}" ${PWD}/for-iso.${pass}.squashfs create_squashfs "${overlay_dir}" ${PWD}/for-iso.${pass}.squashfs
rm ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources rm ${overlay_dir}/etc/apt/sources.list.d/cdrom.sources
else
ln ${squashfs_f} ${PWD}/for-iso.${pass}.squashfs
fi fi
if [ -f config/$pass.catalog-in.yaml ]; then 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 fi
chmod 644 *.squashfs *.manifest* *.size 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