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

Change the desktop build to let canary be the default

Browse Source
This commit is contained in:
Sebastien Bacher 2022-11-23 17:15:15 +01:00
parent 88ce5fe010
commit 12846905fd
3 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/tests/default-bootstraps vendored
View File

@ -20,7 +20,7 @@ ALL_TRIPLETS="
ubuntu-unity:: ubuntu-unity::
mythbuntu:: mythbuntu::
ubuntu:: ubuntu::
ubuntu:canary: ubuntu:legacy:
ubuntu-base:: ubuntu-base::
ubuntu-base:buildd: ubuntu-base:buildd:
ubuntu-budgie:: ubuntu-budgie::

2
live-build/auto/build
View File

@ -527,7 +527,7 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
done done
# we don't need a manifest-remove for a layered-aware installer # we don't need a manifest-remove for a layered-aware installer
if [ "$PROJECT" = "ubuntu" ] && [ "$SUBPROJECT" = "canary" ]; then if [ "$PROJECT" = "ubuntu" ] && [ "$SUBPROJECT" != "legacy" ]; then
rm -f livecd.${PROJECT}-manifest-remove rm -f livecd.${PROJECT}-manifest-remove
rm -f config/manifest-minimal-remove rm -f config/manifest-minimal-remove
fi fi

77
live-build/auto/config
View File

@ -550,7 +550,7 @@ case $IMAGEFORMAT in
ubuntu-wsl) ubuntu-wsl)
;; ;;
ubuntu) ubuntu)
if [ "$SUBPROJECT" != "canary" ]; then if [ "$SUBPROJECT" = "legacy" ]; then
add_package live casper add_package live casper
fi fi
;; ;;
@ -681,7 +681,43 @@ case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
case ${SUBPROJECT:-} in case ${SUBPROJECT:-} in
canary) legacy)
LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-22.04'
if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel'
fi
;;
desktop-preinstalled)
add_task install minimal standard ubuntu-desktop
case $SUBARCH in
raspi)
add_task install ubuntu-desktop-raspi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# for existing raspi preinstalled images
# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;;
intel-iot)
KERNEL_FLAVOURS='image-intel'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;;
*)
## Otherwise HYPERV image options.... *crickets* see the hyperv hook
;;
esac
;;
*)
touch config/universe-enabled touch config/universe-enabled
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
@ -718,43 +754,6 @@ case $PROJECT in
/usr/share/livecd-rootfs/checkout-translations-branch \ /usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations https://git.launchpad.net/subiquity po config/catalog-translations
;; ;;
desktop-preinstalled)
add_task install minimal standard ubuntu-desktop
case $SUBARCH in
raspi)
add_task install ubuntu-desktop-raspi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# for existing raspi preinstalled images
# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;;
intel-iot)
KERNEL_FLAVOURS='image-intel'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;;
*)
## Otherwise HYPERV image options.... *crickets* see the hyperv hook
;;
esac
;;
*)
LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-22.04'
if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel'
fi
;;
esac esac
;; ;;