Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-31 20:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'edubuntu-dev/ubuntu/master' into ubuntu/master

Browse Source
This commit is contained in:
Steve Langasek 2023-02-14 15:55:20 -08:00
commit 202ad011c1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/tests/default-bootstraps vendored
View File

@ -13,6 +13,7 @@ fi
# Listed subprojects can be combined with other projects as well, # Listed subprojects can be combined with other projects as well,
# but this list gives reasonable coverage. # but this list gives reasonable coverage.
ALL_TRIPLETS=" ALL_TRIPLETS="
edubuntu::
kubuntu:: kubuntu::
kubuntu-dvd:: kubuntu-dvd::
kubuntu-plasma5:: kubuntu-plasma5::

7
live-build/auto/config
View File

@ -653,7 +653,7 @@ case $PROJECT in
ubuntu-server) ubuntu-server)
COMPONENTS='main' 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' COMPONENTS='main restricted universe'
;; ;;
xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity)
@ -775,6 +775,11 @@ case $PROJECT in
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache
;; ;;
edubuntu)
add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome
LIVE_TASK='edubuntu-live'
;;
xubuntu) xubuntu)
case ${SUBPROJECT:-} in case ${SUBPROJECT:-} in
minimal) minimal)