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

Merge branch 'delete-base-project' into ubuntu/master

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-05-13 10:30:27 +12:00
commit a1a21e9ecb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,9 +1,14 @@
livecd-rootfs (2.723) UNRELEASED; urgency=medium livecd-rootfs (2.723) UNRELEASED; urgency=medium
[ Steve Langasek ]
* Drop code for the 'ubuntu-core' project when not using * Drop code for the 'ubuntu-core' project when not using
image_format: ubuntu-image, as this is obsolete and not used to build image_format: ubuntu-image, as this is obsolete and not used to build
core* snaps in recent series. core* snaps in recent series.
[ Michael Hudson-Doyle ]
* Remove all references to the "base" project, which has not been
built since 16.04 release day.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 11 May 2021 17:08:24 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 11 May 2021 17:08:24 -0700
livecd-rootfs (2.722) impish; urgency=medium livecd-rootfs (2.722) impish; urgency=medium

1
debian/tests/default-bootstraps vendored
View File

@ -13,7 +13,6 @@ 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="
base::
edubuntu:: edubuntu::
edubuntu-dvd:: edubuntu-dvd::
kubuntu:: kubuntu::

8
live-build/auto/config
View File

@ -525,7 +525,7 @@ if [ "$PREINSTALLED" = "true" ]; then
ubuntu-server) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf add_package live oem-config-debconf ubiquity-frontend-debconf
;; ;;
ubuntu-base|ubuntu-oci|base|ubuntu-cpc) ubuntu-base|ubuntu-oci|ubuntu-cpc)
;; ;;
ubuntu) ubuntu)
add_package live oem-config-gtk ubiquity-frontend-gtk add_package live oem-config-gtk ubiquity-frontend-gtk
@ -732,10 +732,6 @@ case $PROJECT in
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
base)
add_task install minimal standard
;;
ubuntu-server) ubuntu-server)
add_task install minimal add_task install minimal
case ${SUBPROJECT:-} in case ${SUBPROJECT:-} in
@ -1000,7 +996,7 @@ if [ "${IMAGE_HAS_HARDCODED_PASSWORD:-}" = "1" ]; then
fi fi
case $PROJECT in case $PROJECT in
ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|base) ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci)
# ubuntu-cpc gets this added in 025-create-groups.chroot, and we do # ubuntu-cpc gets this added in 025-create-groups.chroot, and we do
# not want this group in projects that are effectively just chroots # not want this group in projects that are effectively just chroots
;; ;;