From 6cf691e25bb5fc0c3a29e747ca053dfe8e85d885 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 21 Jan 2023 11:51:20 -0600 Subject: [PATCH] Make xubuntu minimal a subproject --- debian/tests/default-bootstraps | 2 +- live-build/auto/config | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 76869366..7b203c02 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -39,7 +39,7 @@ ALL_TRIPLETS=" ubuntu-netbook:: ubuntu-server:live:ubuntu-server xubuntu:: - xubuntu-minimal::" + xubuntu:minimal:" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index 5048270c..2e0fda8a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -656,7 +656,7 @@ case $PROJECT in kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; - xubuntu|xubuntu-minimal|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -776,16 +776,14 @@ case $PROJECT in ;; xubuntu) - add_task install minimal standard xubuntu-desktop - add_package install xterm - LIVE_TASK='xubuntu-live' - case $ARCH in - amd64) KERNEL_FLAVOURS=generic ;; + case ${SUBPROJECT:-} in + minimal) + add_task install minimal standard xubuntu-desktop-minimal + ;; + *) + add_task install minimal standard xubuntu-desktop + ;; esac - ;; - - xubuntu-minimal) - add_task install minimal standard xubuntu-desktop-minimal add_package install xterm LIVE_TASK='xubuntu-live' case $ARCH in