Compare commits

..

No commits in common. "ubuntu/master" and "26.04.28" have entirely different histories.

3 changed files with 6 additions and 25 deletions

13
debian/changelog vendored
View File

@ -1,16 +1,3 @@
livecd-rootfs (26.04.30) resolute; urgency=medium
* Exclude boot/grub/i386-pc/eltorito.img from md5sum.txt, as it is expected
to change in xorriso output. (LP: #2147162)
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 03 Apr 2026 18:21:58 -0600
livecd-rootfs (26.04.29) resolute; urgency=medium
* Make sure to produce a manifest for all images (LP: #2147522)
-- Florent 'Skia' Jacquet <skia@ubuntu.com> Wed, 08 Apr 2026 16:12:59 +0200
livecd-rootfs (26.04.28) resolute; urgency=medium
* Switch arm64 mirror from ports to archive. (LP: #2147101)

View File

@ -559,16 +559,13 @@ 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"
elif [ -e "binary/$INITFS/filesystem.packages" ]; then
# '--initramfs none' produces different manifest names.
ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
elif [ -n "$PASSES" ]; then
# For layered images, keep the manifest of the last pass
for _PASS in $PASSES; do
ln -f "${CASPER_DIR}/$_PASS.manifest.full" "$PREFIX.manifest"
done
fi
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.

View File

@ -273,14 +273,11 @@ class ISOBuilder:
def checksum(self):
# Generate md5sum.txt for ISO integrity verification.
# - Symlinks are excluded because their targets are already checksummed
# - eltorito.img is excluded because xorriso will modify it in output ISO
# - Files are sorted for deterministic, reproducible output across builds
# - Paths use "./" prefix and we run md5sum from iso_root so the output
# matches what users get when they verify with "md5sum -c" from the ISO
all_files = []
exclusions = ["eltorito.img"]
for dirpath, dirnames, filenames in self.iso_root.walk():
filenames = [fn for fn in filenames if fn not in exclusions]
filepaths = [dirpath.joinpath(filename) for filename in filenames]
all_files.extend(
"./" + str(filepath.relative_to(self.iso_root))