From 5d23ea3d83bd430985a91e1ce0d6d9e0c58f5f8d Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sun, 18 Feb 2024 06:40:11 -0500 Subject: [PATCH] Smarter layering (thanks vorlon) --- 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 2c01e103..e678b2d3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -897,11 +897,10 @@ case $PROJECT in EOF case ${SUBPROJECT:-} in minimal) - echo "default: yes" >> config/minimal.catalog-in.yaml - add_task minimal.live xubuntu-minimal-live - add_package minimal.live linux-$KERNEL_FLAVOURS + LIVE_LAYER_PARENT=minimal *) # the standard layer, for standard installs (desktop iso) + LIVE_LAYER_PARENT=minimal.standard add_task minimal.standard xubuntu-desktop cat <<-EOF > config/minimal.standard.catalog-in.yaml name: "Xubuntu Desktop" @@ -913,10 +912,10 @@ case $PROJECT in locale_support: langpack default: yes EOF - add_task minimal.standard.live xubuntu-live - add_package minimal.standard.live linux-$KERNEL_FLAVOURS ;; esac + add_task ${LIVE_LAYER_PARENT}.live xubuntu-live + add_package ${LIVE_LAYER_PARENT}.live linux-$KERNEL_FLAVORS /usr/share/livecd-rootfs/checkout-translations-branch \ https://git.launchpad.net/subiquity po config/catalog-translations ;;