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

Merge branch 'uc18-kassel' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source 
Bumped the changelog entry timestamp.
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-05-31 10:42:11 +02:00
commit e3b7b319c1
2 changed files with 21 additions and 4 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.589) UNRELEASED; 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
* Add an explicit build-dependency on python3-yaml since livecd-rootfs

19
live-build/auto/config
View File

@ -332,6 +332,7 @@ case $IMAGEFORMAT in
;;
ubuntu-image)
UBUNTU_IMAGE_ARGS=""
case "$ARCH+${SUBARCH:-}" in
amd64+*)
MODEL=pc-amd64 ;;
@ -355,12 +356,14 @@ case $IMAGEFORMAT in
if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images
EXTRA_SNAPS=""
case $MODEL in
pc-amd64|pc-i386)
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
*)
UBUNTU_IMAGE_ARGS="" ;;
[ -z "${SUBARCH:-}" ] \
&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
;;
*) ;;
esac
case $SUITE in
xenial)
@ -371,6 +374,15 @@ case $IMAGEFORMAT in
MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
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 "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# 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 ;;
esac
UBUNTU_IMAGE_ARGS=""
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"