Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-04-02 15:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

still publish manifest for ISO builds

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-04-02 13:55:18 +13:00
parent ace1c5f700
commit 93c96af216
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
live-build/auto/build
View File

@ -424,11 +424,12 @@ case $LB_INITRAMFS in
;; ;;
esac esac
# For MAKE_ISO=yes builds, artifacts (squashfs, kernel, initrd, manifests) are # For MAKE_ISO=yes builds, most artifacts (squashfs, kernel, initrd) are
# placed directly into the ISO tree by lb_binary_layered and binary hooks. # placed directly into the ISO tree by lb_binary_layered and binary hooks.
# Only create livecd.* intermediate artifacts for non-ISO builds. # Only create livecd.* intermediate artifacts for non-ISO builds; the manifest
# is created unconditionally below.
if [ "${MAKE_ISO}" != "yes" ]; then if [ "${MAKE_ISO}" != "yes" ]; then
for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do for OUTPUT in ext2 ext3 ext4 manifest-remove size squashfs; do
[ -e "binary/$INITFS/filesystem.$OUTPUT" ] || continue [ -e "binary/$INITFS/filesystem.$OUTPUT" ] || continue
ln "binary/$INITFS/filesystem.$OUTPUT" "$PREFIX.$OUTPUT" ln "binary/$INITFS/filesystem.$OUTPUT" "$PREFIX.$OUTPUT"
chmod 644 "$PREFIX.$OUTPUT" chmod 644 "$PREFIX.$OUTPUT"
@ -455,12 +456,6 @@ if [ "${MAKE_ISO}" != "yes" ]; then
cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz" cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
fi fi
# '--initramfs none' produces different manifest names.
if [ -e "binary/$INITFS/filesystem.packages" ]; then
ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
chmod 644 "$PREFIX.manifest"
fi
# If a .filelist is present, use it as the filelist for the image by # If a .filelist is present, use it as the filelist for the image by
# symlinking with expected name and updating permissions # symlinking with expected name and updating permissions
if [ -e "binary/$INITFS/filesystem.filelist" ]; then if [ -e "binary/$INITFS/filesystem.filelist" ]; then
@ -476,13 +471,6 @@ if [ "${MAKE_ISO}" != "yes" ]; then
fi fi
fi fi
# Since snaps are now Ubuntu first-class citizen, so always try fetching the
# list of seeded snaps into the manifest. In case of layered images we skip
# this step, as we assume they're doing it on their own at some earlier stage.
if [ -z "$PASSES" ] && [ -e "$PREFIX.manifest" ]; then
./config/snap-seed-parse "chroot/" "$PREFIX.manifest"
fi
for FLAVOUR in $LB_LINUX_FLAVOURS; do for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue continue
@ -568,6 +556,23 @@ if [ "${MAKE_ISO}" != "yes" ]; then
esac esac
fi fi
# Create manifest unconditionally (needed for both ISO and non-ISO builds).
if [ -e "binary/$INITFS/filesystem.manifest" ]; then
ln "binary/$INITFS/filesystem.manifest" "$PREFIX.manifest"
chmod 644 "$PREFIX.manifest"
fi
# '--initramfs none' produces different manifest names.
if [ -e "binary/$INITFS/filesystem.packages" ]; then
ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
chmod 644 "$PREFIX.manifest"
fi
# Since snaps are now Ubuntu first-class citizen, so always try fetching the
# list of seeded snaps into the manifest. In case of layered images we skip
# this step, as we assume they're doing it on their own at some earlier stage.
if [ -z "$PASSES" ] && [ -e "$PREFIX.manifest" ]; then
./config/snap-seed-parse "chroot/" "$PREFIX.manifest"
fi
case $PROJECT in case $PROJECT in
ubuntu-cpc) ubuntu-cpc)
config/hooks.d/remove-implicit-artifacts config/hooks.d/remove-implicit-artifacts