Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-15 10:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.525.44

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-07-28 20:47:30 +00:00
parent 7477465912
commit 2ffcfdfed7
2 changed files with 18 additions and 2 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.525.44) bionic; urgency=medium
* Add support for building uc18 appliance images (LP: #1887673).
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 07 May 2020 18:38:54 +0200
livecd-rootfs (2.525.43) bionic; urgency=medium
[ David Krauser ]

14
live-build/auto/config
View File

@ -177,7 +177,15 @@ case $IMAGEFORMAT in
ubuntu-image)
UBUNTU_IMAGE_ARGS=""
BRAND_ID="canonical"
case "$ARCH+${SUBARCH:-}" in
# Handle appliance images
*+appliance-*)
BRAND_ID="ubuntu"
MODEL="${SUBARCH#appliance-}"
APPLIANCE=1
;;
amd64+*)
MODEL=pc-amd64 ;;
i386+*)
@ -218,7 +226,9 @@ case $IMAGEFORMAT in
;;
*)
# Ubuntu Core 18
MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
[ -z "${APPLIANCE:-}" ] \
&& MODEL="ubuntu-core-18-${MODEL#pc-}"
;;
esac
case "$ARCH+${SUBARCH:-}" in
@ -233,7 +243,7 @@ case $IMAGEFORMAT in
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id="$BRAND_ID" > "$PREFIX".model-assertion
echo "Configured ubuntu-image for the following model assertion:"
cat "$PREFIX".model-assertion
echo "----------------------------------------------------------"