From 00151c5e0bcccfa225281ff181a50ef594b8411f Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 16 Aug 2018 21:28:52 +1200 Subject: [PATCH 1/8] Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. --- debian/changelog | 7 +++++++ live-build/auto/config | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6a426743..aa7c804b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.535~ppa1) cosmic; urgency=medium + + * Set PREINSTALLED=true for live-server so that universe ends up being + enabled in the image. + + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index 821977df..5ea1f6fe 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,6 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto + PREINSTALLED=true ;; *) PREINSTALLED=true From 1aa8b9d882b44e1237b556f552f7c979740a5f95 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 10:09:57 +1200 Subject: [PATCH 2/8] ffs --- debian/changelog | 4 ++-- live-build/auto/config | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa7c804b..83ba3237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -livecd-rootfs (2.535~ppa1) cosmic; urgency=medium +livecd-rootfs (2.535~ppa2) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. + enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 diff --git a/live-build/auto/config b/live-build/auto/config index 5ea1f6fe..c4b67e5b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -495,9 +495,11 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; + *) + PREINSTALL_POOL_SEEDS='server-ship' + ;; esac COMPONENTS='main' - PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) @@ -695,6 +697,10 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi +if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then + add_task live "$LIVE_TASK" +fi + case $PROJECT in ubuntu-dvd) From e80459b96755b984b22acc8726cd7292ac732c4e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 11:09:37 +1200 Subject: [PATCH 3/8] grumble --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 83ba3237..dc3a9177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -livecd-rootfs (2.535~ppa2) cosmic; urgency=medium +livecd-rootfs (2.535~ppa3) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. + And that the LIVE_TASK gets installed. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 From a2614719699eb2d72f6ba77f1d25dd5982574be5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:00:41 +1200 Subject: [PATCH 4/8] a less hackish approach --- live-build/auto/build | 2 +- live-build/auto/config | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index c71b7b10..50831ba2 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -268,7 +268,7 @@ EOF rm -rf chroot/var/lib/apt/lists/* fi - if [ -f config/oem-config-preinstalled ]; then + if [ -f config/universe-enabled ]; then # This is cargo-culted almost verbatim (with some syntax changes for # preinstalled being slightly different in what it doesn't ask) from diff --git a/live-build/auto/config b/live-build/auto/config index c4b67e5b..070d73f3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,7 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto - PREINSTALLED=true + touch config/universe-enabled ;; *) PREINSTALLED=true @@ -214,9 +214,9 @@ case $IMAGEFORMAT in esac if [ "$PREINSTALLED" = "true" ]; then - # This is an oem-config preinstalled image, touch a random file that - # we can refer back to during build, cause that's wildly hackish - touch config/oem-config-preinstalled + # Touch a random file that we can refer back to during build, + # cause that's wildly hackish + touch config/universe-enabled case $PROJECT in kubuntu*) add_package live oem-config-kde ubiquity-frontend-kde @@ -495,10 +495,8 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; - *) - PREINSTALL_POOL_SEEDS='server-ship' - ;; esac + PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' ;; @@ -697,10 +695,6 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi -if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then - add_task live "$LIVE_TASK" -fi - case $PROJECT in ubuntu-dvd) From e804cc4e00d53a4d20a822911da11e07fb76a488 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:01:27 +1200 Subject: [PATCH 5/8] a less hackish approach --- 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 070d73f3..4d492d31 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -496,8 +496,8 @@ case $PROJECT in esac ;; esac - PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' + PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) From 59b8eb76e2d35d004aa6aa47cdc717acb298a043 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:04:12 +1200 Subject: [PATCH 6/8] Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. --- debian/changelog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc3a9177..4a95350d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -livecd-rootfs (2.535~ppa3) cosmic; urgency=medium +livecd-rootfs (2.535~ppa4) cosmic; urgency=medium - * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. - And that the LIVE_TASK gets installed. + * Disentangle enabling universe in the final image a little from having + PREINSTALLED=true set and enable it for a live-server build. - -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 livecd-rootfs (2.534) cosmic; urgency=medium From 15505866a8ad903b3baa1e0e68f1ee4f824540ec Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 13:51:55 +1200 Subject: [PATCH 7/8] add bug ref to changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 4a95350d..1eca5b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.535~ppa4) cosmic; urgency=medium * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. + (LP: #1783129) -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 From 061ea269840dd52dc4fdc0c8603283df91f95dad Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 16:14:41 +1200 Subject: [PATCH 8/8] fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1eca5b5c..229d6d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.535~ppa4) cosmic; urgency=medium +livecd-rootfs (2.535) UNRELEASED; urgency=medium * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build.