From fa81e76cbe05842382cd4fd8876d45c406ef169e Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 7 Jan 2023 22:47:49 -0500 Subject: [PATCH 1/4] Enable xubuntu-core --- debian/tests/default-bootstraps | 3 ++- live-build/auto/config | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9e1fc5f6..6e8cbb8f 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -38,7 +38,8 @@ ALL_TRIPLETS=" ubuntu-mate-live:: ubuntu-netbook:: ubuntu-server:live:ubuntu-server - xubuntu::" + xubuntu:: + xubuntu-core::" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index 1722e98b..e8f45d1e 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|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + xubuntu|xubuntu-core|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -784,6 +784,15 @@ case $PROJECT in esac ;; + xubuntu-core) + add_task install minimal standard xubuntu-core + add_package install xterm + LIVE_TASK='xubuntu-live' + case $ARCH in + amd64) KERNEL_FLAVOURS=generic ;; + esac + ;; + ubuntu-netbook) add_task install minimal standard ubuntu-netbook LIVE_TASK='netbook-live' From c72e5c8d03080e70805cc0672901d9f126a97e6e Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sun, 8 Jan 2023 00:19:56 -0500 Subject: [PATCH 2/4] Rename Xubuntu Core > Xubuntu Minimal --- debian/tests/default-bootstraps | 2 +- live-build/auto/config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 6e8cbb8f..76869366 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-core::" + xubuntu-minimal::" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index e8f45d1e..3b12488b 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-core|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + xubuntu|xubuntu-minimal|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -784,7 +784,7 @@ case $PROJECT in esac ;; - xubuntu-core) + xubuntu-minimal) add_task install minimal standard xubuntu-core add_package install xterm LIVE_TASK='xubuntu-live' From cf6104b94ed97415b39ef7899bbf3b38edce6461 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Fri, 13 Jan 2023 07:37:30 -0500 Subject: [PATCH 3/4] Rename task to xubuntu-desktop-minimal --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 3b12488b..5048270c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -785,7 +785,7 @@ case $PROJECT in ;; xubuntu-minimal) - add_task install minimal standard xubuntu-core + add_task install minimal standard xubuntu-desktop-minimal add_package install xterm LIVE_TASK='xubuntu-live' case $ARCH in From 6cf691e25bb5fc0c3a29e747ca053dfe8e85d885 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 21 Jan 2023 11:51:20 -0600 Subject: [PATCH 4/4] 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