mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-12-16 00:23:29 +00:00
ubuntu: when building stable image, don't take pc-kernel from beta
The pc-kernel version in 26.04/beta is kernel 6.17, which uses different components from what is currently declared in the model. This used to be necessary when there was no kernel in 26.04/stable, but now there is a 6.8 version in 26.04/stable. The available components match what's in the model. Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
parent
49e1ab15cd
commit
caf4f1030a
@ -100,14 +100,13 @@ else
|
|||||||
# because it allows us to override snaps. But we don't want all snaps from
|
# because it allows us to override snaps. But we don't want all snaps from
|
||||||
# edge like the dangerous model has, we want most of them from stable
|
# edge like the dangerous model has, we want most of them from stable
|
||||||
# excluding:
|
# excluding:
|
||||||
# * pc-kernel - which currently does not exist on stable
|
|
||||||
# * snapd (for TPM/FDE)
|
# * snapd (for TPM/FDE)
|
||||||
# * firmware-updater (for TPM/FDE)
|
# * firmware-updater (for TPM/FDE)
|
||||||
# * desktop-security-center (for TPM/FDE)
|
# * desktop-security-center (for TPM/FDE)
|
||||||
while read -r snap_arg; do
|
while read -r snap_arg; do
|
||||||
prepare_args+=("$snap_arg")
|
prepare_args+=("$snap_arg")
|
||||||
done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model \
|
done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model \
|
||||||
| grep -v -F -e pc-kernel -e snapd -e firmware-updater -e desktop-security-center)
|
| grep -v -F -e snapd -e firmware-updater -e desktop-security-center)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for comp in $(get_all_components "$model"); do
|
for comp in $(get_all_components "$model"); do
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user