Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-13 14:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.705

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-12-02 22:09:26 +00:00
parent 1cc9fe8f97
commit d6c545c09f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.705) hirsute; urgency=medium
* config: on hirsute build UC22 images
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 02 Dec 2020 11:05:55 +0000
livecd-rootfs (2.704) hirsute; urgency=medium
* riscv64: build preinstalled riscv64 image with uboot SPL and CIDATA.

15
live-build/auto/config
View File

@ -381,25 +381,30 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;;
*)
if [ "$SUITE" = "focal" ]; then
CORE_MAJOR=20
else
CORE_MAJOR=22
fi
if [ "${MODEL}" = "pi" ]; then
MODEL=pi-armhf
fi
# Ubuntu Core 20
# Currently uc20 assertions do not support global
# Ubuntu Core 2x
# Currently uc2x assertions do not support global
# channel overrides, instead we have per-channel models
case $CHANNEL in
stable)
MODEL="ubuntu-core-20-${MODEL#pc-}"
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
;;
candidate|beta|edge|dangerous)
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
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-20-${MODEL#pc-}-dangerous"
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous"
CHANNEL=${CHANNEL#dangerous-}
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;;