|
|
@ -721,7 +721,7 @@ case $PROJECT in
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
canary)
|
|
|
|
*)
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
# the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
|
|
|
|
# the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
|
|
|
|
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
|
|
|
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
|
|
@ -772,32 +772,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
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
|
|
|
|
touch config/universe-enabled
|
|
|
|
|
|
|
|
PASSES_TO_LAYERS="true"
|
|
|
|
|
|
|
|
KERNEL_FLAVOURS='generic-hwe-22.04'
|
|
|
|
|
|
|
|
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
|
|
|
|
|
|
|
add_task standard.live ubuntu-live
|
|
|
|
|
|
|
|
add_package standard cloud-init
|
|
|
|
|
|
|
|
remove_package standard.live ubiquity-frontend-gtk
|
|
|
|
|
|
|
|
add_snap standard.live ubuntu-desktop-installer/classic
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
seeded_langs="$(get_seeded_languages desktop)"
|
|
|
|
|
|
|
|
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
|
|
|
|
|
|
|
|
derive_language_layers standard desktop desktop-default-languages "$seeded_langs"
|
|
|
|
|
|
|
|
cat <<-EOF > config/standard.catalog-in.yaml
|
|
|
|
|
|
|
|
name: "Ubuntu Desktop"
|
|
|
|
|
|
|
|
description: >-
|
|
|
|
|
|
|
|
Ubuntu Desktop.
|
|
|
|
|
|
|
|
id: ubuntu-desktop
|
|
|
|
|
|
|
|
type: fsimage-layered
|
|
|
|
|
|
|
|
variant: desktop
|
|
|
|
|
|
|
|
locale_support: langpack
|
|
|
|
|
|
|
|
default: yes
|
|
|
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
/usr/share/livecd-rootfs/checkout-translations-branch \
|
|
|
|
|
|
|
|
https://git.launchpad.net/subiquity po config/catalog-translations
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
@ -1298,7 +1272,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:canary)
|
|
|
|
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:)
|
|
|
|
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
|
|
|
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
|
|
|
KERNEL_FLAVOURS=none
|
|
|
|
KERNEL_FLAVOURS=none
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
|
BINARY_REMOVE_LINUX=false
|
|
|
@ -1552,7 +1526,7 @@ EOF
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
|
|
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
|
|
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary|ubuntu-oem:*)
|
|
|
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*)
|
|
|
|
# Ensure that most things e.g. includes.chroot are copied as is
|
|
|
|
# Ensure that most things e.g. includes.chroot are copied as is
|
|
|
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
|
|
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
|
|
|
case $entry in
|
|
|
|
case $entry in
|
|
|
|