|
|
|
@ -396,6 +396,15 @@ case $IMAGEFORMAT in
|
|
|
|
|
candidate|beta|edge|dangerous)
|
|
|
|
|
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
|
|
|
|
|
;;
|
|
|
|
|
dangerous-*)
|
|
|
|
|
# That being said, the dangerous grade *does*
|
|
|
|
|
# support channel overrides, so we can use the
|
|
|
|
|
# dangerous model assertion and override the channel
|
|
|
|
|
# freely.
|
|
|
|
|
MODEL="ubuntu-core-20-${MODEL#pc-}-dangerous"
|
|
|
|
|
CHANNEL=${CHANNEL#dangerous-}
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
|
|
|
|
|
exit 1
|
|
|
|
@ -679,6 +688,23 @@ case $PROJECT in
|
|
|
|
|
|
|
|
|
|
ubuntustudio-dvd)
|
|
|
|
|
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
|
|
|
|
|
case $SUITE in
|
|
|
|
|
focal)
|
|
|
|
|
# ubuntustudio-default-settings in focal
|
|
|
|
|
# release has a Recommends to this kernel,
|
|
|
|
|
# which makes it impossible to update the
|
|
|
|
|
# kernel later on, since we would install the
|
|
|
|
|
# -updates and release kernel, which isn't
|
|
|
|
|
# allowed and causes the squashfs to fail to
|
|
|
|
|
# build. Hack out the focal-release kernel and
|
|
|
|
|
# let the rest of the build process pull in the
|
|
|
|
|
# right one. (See right below.)
|
|
|
|
|
for package in linux-lowlatency linux-image-lowlatency linux-headers-lowlatency linux-image-5.4.0-26-lowlatency linux-headers-5.4.0-26-lowlatency; do
|
|
|
|
|
sed -i "s/$/ -a --not -XFPackage ${package}/" \
|
|
|
|
|
"config/package-lists/livecd-rootfs.list.chroot_install"
|
|
|
|
|
done
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
COMPONENTS='main restricted universe multiverse'
|
|
|
|
|
case $ARCH in
|
|
|
|
|
amd64|i386) KERNEL_FLAVOURS=lowlatency ;;
|
|
|
|
|