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

Merge branch 'ubuntu/master' into fix/2146567

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-04-15 15:38:36 +12:00
commit 7b5b77ff68
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
9 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/changelog vendored
View File

@ -1,9 +1,31 @@
livecd-rootfs (26.04.32) UNRELEASED; urgency=medium
[ Florent 'Skia' Jacquet ]
* Update SEEDMIRROR to point to the new infra
[ Alfonso Sanchez-Beato ]
* Add support for building Ubuntu Core 26 images.
-- Florent 'Skia' Jacquet <skia@ubuntu.com> Tue, 14 Apr 2026 12:56:52 +0200
livecd-rootfs (26.04.31) resolute; urgency=medium
[ Ryan Hill ]
* Add additional 7.0 kernel apparmor features for
successful image preseeding.
-- Chloé 'kajiya' Smith <chloe.smith@canonical.com> Mon, 13 Apr 2026 15:45:19 +0100
livecd-rootfs (26.04.30) resolute; urgency=medium livecd-rootfs (26.04.30) resolute; urgency=medium
[ Florent 'Skia' Jacquet]
* Pick a better manifest by using the live pass for layered images (LP: #2147921)
[ Dan Bungert ]
* Exclude boot/grub/i386-pc/eltorito.img from md5sum.txt, as it is expected * Exclude boot/grub/i386-pc/eltorito.img from md5sum.txt, as it is expected
to change in xorriso output. (LP: #2147162) to change in xorriso output. (LP: #2147162)
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 03 Apr 2026 18:21:58 -0600 -- Florent 'Skia' Jacquet <skia@ubuntu.com> Mon, 13 Apr 2026 15:16:01 +0200
livecd-rootfs (26.04.29) resolute; urgency=medium livecd-rootfs (26.04.29) resolute; urgency=medium

1
live-build/apparmor/7.0/network_v9_skb/af_mask Normal file
View File

@ -0,0 +1 @@
inet inet6

1
live-build/apparmor/7.0/network_v9_skb/iface Normal file
View File

@ -0,0 +1 @@
receive connect, secmark_postroute

1
live-build/apparmor/7.0/network_v9_skb/localout Normal file
View File

@ -0,0 +1 @@
secmark_set

1
live-build/apparmor/7.0/network_v9_skb/postroute Normal file
View File

@ -0,0 +1 @@
secmark_send

1
live-build/apparmor/7.0/network_v9_skb/rcv_skb Normal file
View File

@ -0,0 +1 @@
secmark_receive

1
live-build/apparmor/7.0/network_v9_skb/relabel Normal file
View File

@ -0,0 +1 @@
setcred

6
live-build/auto/build
View File

@ -562,9 +562,9 @@ if [ -e "binary/$INITFS/filesystem.manifest" ]; then
elif [ -e "binary/$INITFS/filesystem.packages" ]; then elif [ -e "binary/$INITFS/filesystem.packages" ]; then
# '--initramfs none' produces different manifest names. # '--initramfs none' produces different manifest names.
ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest" ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
elif [ -n "$PASSES" ]; then elif [ -n "$LIVE_PASSES" ]; then
# For layered images, keep the manifest of the last pass # For layered images, keep the manifest of the last (only?) live pass
for _PASS in $PASSES; do for _PASS in $LIVE_PASSES; do
ln -f "${CASPER_DIR}/$_PASS.manifest.full" "$PREFIX.manifest" ln -f "${CASPER_DIR}/$_PASS.manifest.full" "$PREFIX.manifest"
done done
fi fi

25
live-build/auto/config
View File

@ -32,12 +32,11 @@ fi
echo "Building on $(hostname --fqdn)" echo "Building on $(hostname --fqdn)"
SEEDMIRROR=https://ubuntu-archive-team.ubuntu.com/seeds/ SEEDMIRROR=https://static-reports.ubuntu.com/seeds/
if [ -z "$MIRROR" ]; then if [ -z "$MIRROR" ]; then
case $(hostname --fqdn) in case $(hostname --fqdn) in
*.ubuntu.com|*.buildd|*.ppa|*.scalingstack) *.ubuntu.com|*.buildd|*.ppa|*.scalingstack)
MIRROR=http://ftpmaster.internal/ubuntu/ MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*) *)
case $ARCH in case $ARCH in
@ -491,31 +490,23 @@ case $IMAGEFORMAT in
*) ;; *) ;;
esac esac
# Ubuntu Core 24 # Ubuntu Core 26
# For now we stick to updating this by hand, but a more tasteful solution # For now we stick to updating this by hand, but a more tasteful solution
# will follow # will follow
CORE_MAJOR=24 CORE_MAJOR=26
# Currently uc24 assertions do not support global channel overrides, # For UC26+ we build only images using stable channels,
# instead we have per-channel models # for either signed or dangerous grade.
case $CHANNEL in case $CHANNEL in
stable) stable)
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}" MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
;; ;;
candidate|beta|edge|dangerous) dangerous-stable)
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-${CHANNEL}"
;;
dangerous-*)
# That being said, the dangerous grade *does*
# support channel overrides, so we can use the
# dangerous model assertion and override the channel
# freely.
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous" MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous"
CHANNEL=${CHANNEL#dangerous-} CHANNEL=${CHANNEL#dangerous-}
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;; ;;
*) *)
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}" echo "Unsupported CHANNEL ${CHANNEL} specification for ${SUITE}"
exit 1 exit 1
;; ;;
esac esac
@ -525,7 +516,7 @@ case $IMAGEFORMAT in
EXTRA_SNAPS="$EXTRA_SNAPS core bluez alsa-utils" EXTRA_SNAPS="$EXTRA_SNAPS core bluez alsa-utils"
;; ;;
*) *)
# For all Ubuntu Core 24 reference images, add console-conf # For all Ubuntu Core reference images, add console-conf
EXTRA_SNAPS="$EXTRA_SNAPS console-conf" EXTRA_SNAPS="$EXTRA_SNAPS console-conf"
;; ;;
esac esac