From f8bcf0174c187626e051ad84e973cc8c2fe99ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 26 Jan 2024 12:32:44 +0100 Subject: [PATCH] Try switching back to only using one layer. Fix up the catalog naming. --- live-build/auto/config | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 51e2da21..f487fdaa 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -814,14 +814,12 @@ case $PROJECT in touch config/universe-enabled KERNEL_FLAVOURS='generic-hwe-22.04' PASSES_TO_LAYERS="true" - # the minimal layer - add_task minimal minimal # the live layer, contains all packages for the live session installer - add_snap minimal.live ubuntu-core-desktop-installer/classic core22 snapd - add_package minimal.live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init + add_snap live minimal ubuntu-core-desktop-installer/classic core22 snapd + add_package live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init # now let's create the neccessary catalog files - cat <<-EOF > config/install-sources-in.yaml + cat <<-EOF > config/live.catalog-in.yaml - default: true description: en: Ubuntu Core Desktop. @@ -837,6 +835,7 @@ case $PROJECT in # we have to manually mark the live layer as the LIVE_PASS, since it's also # the only layer we build + LIVE_PASS=live ;; ubuntu-oem)