Imported 2.809

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-03-07 11:48:09 +00:00
parent 66b89072d5
commit 124ad1ff27
2 changed files with 39 additions and 3 deletions

22
debian/changelog vendored
View File

@ -1,3 +1,25 @@
livecd-rootfs (2.809) lunar; urgency=medium
* Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't
seem to be present in the archive yet. Use the metapackage instead, which
seems like a better way forward anyway. For the live task, temporarily use
a hard-coded list of packages.
* Explicitly define the kernel flavor for ubuntucinnamon.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 06 Mar 2023 11:27:02 +0100
livecd-rootfs (2.808) lunar; urgency=medium
* Add ubuntucinnamon to the seed-determination switch-case.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 03 Mar 2023 15:07:06 +0100
livecd-rootfs (2.807) lunar; urgency=medium
* auto/config: Add support for ubuntu core arm64 generic images (LP: #2009067)
-- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Thu, 02 Mar 2023 18:18:18 +0000
livecd-rootfs (2.806) lunar; urgency=medium livecd-rootfs (2.806) lunar; urgency=medium
[ Sean Davis ] [ Sean Davis ]

View File

@ -405,6 +405,8 @@ case $IMAGEFORMAT in
MODEL=pi3-arm64 ;; MODEL=pi3-arm64 ;;
armhf+cm3) armhf+cm3)
MODEL=cm3 ;; MODEL=cm3 ;;
arm64+*)
MODEL=pc-arm64 ;;
*) *)
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2 echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
exit 1 exit 1
@ -423,7 +425,7 @@ case $IMAGEFORMAT in
CHANNEL="${CHANNEL:-edge}" CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64) pc-amd64|pc-arm64)
if [ -z "${SUBARCH:-}" ]; then if [ -z "${SUBARCH:-}" ]; then
# This is to make sure there's enough writable space # This is to make sure there's enough writable space
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
@ -644,6 +646,9 @@ case $PROJECT in
ubuntustudio*) ubuntustudio*)
SEED=ubuntustudio.$SUITE SEED=ubuntustudio.$SUITE
;; ;;
ubuntucinnamon*)
SEED=ubuntucinnamon.$SUITE
;;
*) *)
SEED=ubuntu.$SUITE SEED=ubuntu.$SUITE
;; ;;
@ -781,8 +786,17 @@ case $PROJECT in
;; ;;
ubuntucinnamon) ubuntucinnamon)
add_task install minimal standard ubuntucinnamon-desktop add_task install minimal standard
LIVE_TASK='ubuntucinnamon-live' add_package install ubuntucinnamon-desktop
# XXX: Adding live packages manually temporarily until we have
# the live task for ubuntucinnamon set up properly.
add_package live ubiquity-frontend-gtk
add_package live ubiquity-ubuntu-artwork ubiquity-slideshow-ubuntu
add_package live gtk-im-libthai ibus-hangul ibus-mozc ibus-unikey
add_package live zfsutils-linux zfs-initramfs zsys
add_package live sssd realmd adcli
add_package live gparted cifs-utils
KERNEL_FLAVOURS=generic
;; ;;
xubuntu) xubuntu)