diff --git a/debian/changelog b/debian/changelog index af4027d6..9f179400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +livecd-rootfs (2.800) lunar; urgency=medium + + * WSL: do not depend on standard anymore. + Evolve the seed to only ship the specific part useful to WSL users. This + allows to trim down the image size. + + -- Didier Roche Mon, 20 Feb 2023 11:59:25 +0100 + +livecd-rootfs (2.799) lunar; urgency=medium + + * Reintroduce edubuntu. + + -- Steve Langasek Tue, 14 Feb 2023 15:55:41 -0800 + +livecd-rootfs (2.798) lunar; urgency=medium + + * Add xubuntu minimal subproject. + + -- Steve Langasek Mon, 13 Feb 2023 21:07:27 -0800 + livecd-rootfs (2.797) lunar; urgency=medium * Drop dependency on rsync, not used in a very long time and lets us drop diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9e1fc5f6..fa345387 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -13,6 +13,7 @@ fi # Listed subprojects can be combined with other projects as well, # but this list gives reasonable coverage. ALL_TRIPLETS=" + edubuntu:: kubuntu:: kubuntu-dvd:: kubuntu-plasma5:: @@ -38,7 +39,8 @@ ALL_TRIPLETS=" ubuntu-mate-live:: ubuntu-netbook:: ubuntu-server:live:ubuntu-server - xubuntu::" + xubuntu:: + xubuntu:minimal:" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index 1722e98b..35e1cb73 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -653,7 +653,7 @@ case $PROJECT in ubuntu-server) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -775,8 +775,20 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; + edubuntu) + add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome + LIVE_TASK='edubuntu-live' + ;; + xubuntu) - add_task install minimal standard xubuntu-desktop + case ${SUBPROJECT:-} in + minimal) + add_task install minimal standard xubuntu-desktop-minimal + ;; + *) + add_task install minimal standard xubuntu-desktop + ;; + esac add_package install xterm LIVE_TASK='xubuntu-live' case $ARCH in @@ -916,7 +928,7 @@ case $PROJECT in ;; ubuntu-wsl) - add_task install minimal standard ubuntu-wsl + add_task install minimal ubuntu-wsl OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false