Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-02-13 21:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu: for the stable image, use the stable model

Browse Source 
Let's stop leaning on overrides for now.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2026-02-09 16:41:39 +01:00
parent e26de340e2
commit 733ad14e33
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (26.04.17) UNRELEASED; urgency=medium
* desktop: build the stable ISO using the stable model - essentially
reverting all the hacks.
-- Olivier Gayot <olivier.gayot@canonical.com> Thu, 12 Feb 2026 10:20:52 +0100
livecd-rootfs (26.04.16) resolute; urgency=medium livecd-rootfs (26.04.16) resolute; urgency=medium
* Rename ISO_STATUS to BUILD_TYPE for image builds. * Rename ISO_STATUS to BUILD_TYPE for image builds.

31
live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
View File

@ -148,31 +148,26 @@ if [ "$SUBPROJECT" = "dangerous" ]; then
components+=("$comp") components+=("$comp")
done done
else else
# Normally we use the stable model here. Use the dangerous one for now model="${stable_model}"
# until we get snaps on stable 26.04 tracks and channels. # If we need to override anything from the model, we need grade: dangerous.
#model="${stable_model}" # And if so, uncomment the below to use the dangerous model and set the
model="${dangerous_model}" # snaps_from_dangerous and snaps_from_beta variables to still use snaps
# We're currently using the dangerous model for the stable image because it # from the stable model.
# allows us to override snaps. But we don't want all snaps from edge like #model="${dangerous_model}"
# the dangerous model has, we want most of them from stable excluding: snaps_from_dangerous=()
# * snapd-desktop-integration (for TPM/FDE)
# * firmware-updater (for TPM/FDE)
# * desktop-security-center (for TPM/FDE)
snaps_from_dangerous=(snapd-desktop-integration firmware-updater desktop-security-center)
# For these snaps, we ignore the model entirely. # For these snaps, we ignore the model entirely.
snaps_from_beta=(snapd) snaps_from_beta=()
for snap in "${snaps_from_beta[@]}"; do for snap in "${snaps_from_beta[@]}"; do
prepare_args+=("--snap=$snap=beta") prepare_args+=("--snap=$snap=beta")
done done
# snaps that we are special casing. # snaps that we are special casing.
_exclude=("${snaps_from_dangerous[@]}" "${snaps_from_beta[@]}") _exclude=("${snaps_from_dangerous[@]}" "${snaps_from_beta[@]}")
for snap_arg in $(get_snaps_args_excluding "$stable_model" "${_exclude[@]}"); do if [ "$model" = "$dangerous_model" ]; then
prepare_args+=("$snap_arg") for snap_arg in $(get_snaps_args_excluding "$stable_model" "${_exclude[@]}"); do
done prepare_args+=("$snap_arg")
done
fi
for comp in $(get_components_excluding "$stable_model" "${_exclude[@]}"); do for comp in $(get_components_excluding "$stable_model" "${_exclude[@]}"); do
components+=("$comp") components+=("$comp")
done done