Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-12 11:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Snapd for uc20 model assertions does not support global channel overrides.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-12-12 16:58:42 +01:00
parent 93dd6d3ef4
commit 474f232840
3 changed files with 17 additions and 4 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 (2.633) UNAPPROVED; urgency=medium
* Snapd for uc20 model assertions does not support global channel overrides.
So make sure --channel is not passed to u-i for any uc20 builds for now.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 12 Dec 2019 14:10:37 +0100
livecd-rootfs (2.632) focal; urgency=medium livecd-rootfs (2.632) focal; urgency=medium
[ David Krauser ] [ David Krauser ]

3
live-build/auto/build
View File

@ -74,9 +74,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
if [ "$PROJECT" = "ubuntu-core" ]; then if [ "$PROJECT" = "ubuntu-core" ]; then
CHANNEL="${CHANNEL:-edge}"
env SNAPPY_STORE_NO_CDN=1 \ env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image snap -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \ ubuntu-image snap $UBUNTU_IMAGE_ARGS \
-O output "$PREFIX".model-assertion -O output "$PREFIX".model-assertion
# XXX: currently we only have one image generated, but really # XXX: currently we only have one image generated, but really
# we should be supporting more than one for models that # we should be supporting more than one for models that

11
live-build/auto/config
View File

@ -345,6 +345,7 @@ case $IMAGEFORMAT in
if [ $PROJECT = "ubuntu-core" ]; then if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images # snap-based core images
CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
[ -z "${SUBARCH:-}" ] \ [ -z "${SUBARCH:-}" ] \
@ -355,13 +356,19 @@ case $IMAGEFORMAT in
case $SUITE in case $SUITE in
xenial) xenial)
# Ubuntu Core 16 # Ubuntu Core 16
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;; ;;
bionic) bionic)
# Ubuntu Core 18 # Ubuntu Core 18
MODEL="ubuntu-core-18-${MODEL#pc-}" ;; MODEL="ubuntu-core-18-${MODEL#pc-}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;;
*) *)
# Ubuntu Core 20 # Ubuntu Core 20
MODEL="ubuntu-core-20-${MODEL#pc-}" ;; # XXX: Currently uc20 assertions do not support global
# channel overrides.
MODEL="ubuntu-core-20-${MODEL#pc-}"
;;
esac esac
case "$ARCH+${SUBARCH:-}" in case "$ARCH+${SUBARCH:-}" in