Imported 2.589

No reason for CPC update specified.
impish
CloudBuilder 6 years ago
parent 7312293048
commit 3335e6bd8e

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (2.589) eoan; urgency=medium
* Add support for the 'kassel' subflavor of UC18 images.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 31 May 2019 01:41:13 -0700
livecd-rootfs (2.588) eoan; urgency=medium livecd-rootfs (2.588) eoan; urgency=medium
* Add an explicit build-dependency on python3-yaml since livecd-rootfs * Add an explicit build-dependency on python3-yaml since livecd-rootfs

@ -332,6 +332,7 @@ case $IMAGEFORMAT in
;; ;;
ubuntu-image) ubuntu-image)
UBUNTU_IMAGE_ARGS=""
case "$ARCH+${SUBARCH:-}" in case "$ARCH+${SUBARCH:-}" in
amd64+*) amd64+*)
MODEL=pc-amd64 ;; MODEL=pc-amd64 ;;
@ -355,12 +356,14 @@ case $IMAGEFORMAT in
if [ $PROJECT = "ubuntu-core" ]; then if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images # snap-based core images
EXTRA_SNAPS=""
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;; [ -z "${SUBARCH:-}" ] \
*) && UBUNTU_IMAGE_ARGS="--image-size 3700M"
UBUNTU_IMAGE_ARGS="" ;; ;;
*) ;;
esac esac
case $SUITE in case $SUITE in
xenial) xenial)
@ -371,6 +374,15 @@ case $IMAGEFORMAT in
MODEL="ubuntu-core-18-${MODEL#pc-}" ;; MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
esac esac
case "$ARCH+${SUBARCH:-}" in
amd64+kassel)
EXTRA_SNAPS="core bluez alsa-utils pulseaudio udisks2"
;;
*) ;;
esac
for snap in $EXTRA_SNAPS; do
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
done
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> 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 # Store model assertion in top dir to get it picked up later as a build artifact
@ -387,7 +399,6 @@ case $IMAGEFORMAT in
MODEL=pi3 ;; MODEL=pi3 ;;
esac esac
UBUNTU_IMAGE_ARGS=""
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"

Loading…
Cancel
Save