From 480e02443e7ae35e70e75648cf8d5069921855ee Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:08:44 -0500 Subject: [PATCH 1/5] Drop seed workarounds for unbuilt Lubuntu Next. --- live-build/auto/config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index e07aeb85..f66dfc07 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -671,15 +671,9 @@ esac # we'll expand the base seed given here according to the STRUCTURE file, and # then look in all of the seeds found to see which snaps are seeded case $PROJECT:${SUBPROJECT:-} in - ubuntu:*|kubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) + ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) BASE_SEED='desktop' ;; - lubuntu-next:*) - BASE_SEED='desktop-qt' - ;; - lubuntu:*) - BASE_SEED='desktop-gtk' - ;; ubuntu-server:live) BASE_SEED='server' # subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS. From 0f073af40323fa212dafaed7061899693a67a560 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:19:45 -0500 Subject: [PATCH 2/5] Add a changelog entry. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 817e0429..6e38cb8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.526) UNRELEASED; urgency=medium + + * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next + now that Lubuntu Next is Lubuntu. + + -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 + livecd-rootfs (2.525) bionic; urgency=medium * Don't fail to build CPC images if /lib/modules already exists in the From 382f17b08cd46da082140fbe4aa86f81ff44aa18 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:23:30 -0500 Subject: [PATCH 3/5] Don't follow recommends. --- debian/changelog | 2 ++ live-build/auto/config | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e38cb8a..caf3415b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ livecd-rootfs (2.526) UNRELEASED; urgency=medium * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next now that Lubuntu Next is Lubuntu. + * Don't follow recommends on Lubuntu now that this is no longer the + case in the seed. -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 diff --git a/live-build/auto/config b/live-build/auto/config index f66dfc07..10f288ab 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -432,10 +432,6 @@ case $PROJECT in case $ARCH in amd64|i386) KERNEL_FLAVOURS=generic ;; esac - - # The Lubuntu STRUCTURE file has "feature - # no-follow-recommends". Mirror this. - APT_OPTIONS="${APT_OPTIONS} --no-install-recommends" ;; lubuntu-next) @@ -448,10 +444,6 @@ case $PROJECT in case $ARCH in amd64|i386) KERNEL_FLAVOURS=generic ;; esac - - # The Lubuntu STRUCTURE file has "feature - # no-follow-recommends". Mirror this. - APT_OPTIONS="${APT_OPTIONS} --no-install-recommends" ;; ubuntu-gnome) From 9ba04172d4010dea59755eb014a67e374d560f6e Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 8 May 2018 21:12:15 -0500 Subject: [PATCH 4/5] Completely drop Lubuntu Next. --- debian/changelog | 3 +-- debian/tests/default-bootstraps | 1 - live-build/auto/config | 14 +------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index caf3415b..0d89af0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ livecd-rootfs (2.526) UNRELEASED; urgency=medium - * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next - now that Lubuntu Next is Lubuntu. + * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. * Don't follow recommends on Lubuntu now that this is no longer the case in the seed. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 433cd327..0c0062a6 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -21,7 +21,6 @@ ALL_TRIPLETS=" kubuntu-dvd:: kubuntu-plasma5:: lubuntu:: - lubuntu-next:: mythbuntu:: ubuntu:: ubuntu-base:: diff --git a/live-build/auto/config b/live-build/auto/config index 10f288ab..069a69dc 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -323,7 +323,7 @@ if ! [ -e config/germinate-output/structure ]; then fi case $PROJECT in - base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) + base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) INITRAMFS_COMPRESSION="lzma" ;; esac @@ -434,18 +434,6 @@ case $PROJECT in esac ;; - lubuntu-next) - add_task install minimal standard lubuntu-qt-desktop - LIVE_TASK='lubuntu-live-qt' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac - COMPONENTS='main restricted universe multiverse' - case $ARCH in - amd64|i386) KERNEL_FLAVOURS=generic ;; - esac - ;; - ubuntu-gnome) add_task install minimal standard ubuntu-gnome-desktop LIVE_TASK='ubuntu-gnome-live' From 021ffbbf16302bf9ccf19d439ea67dc64d0815ab Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 16 May 2018 15:11:32 -0600 Subject: [PATCH 5/5] Release 2.526 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0d89af0f..e3aa5680 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.526) UNRELEASED; urgency=medium +livecd-rootfs (2.526) cosmic; urgency=medium * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. * Don't follow recommends on Lubuntu now that this is no longer the