From 61b74940eaa289d9765c123b473f77bea91ba9bf Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 24 Aug 2018 13:04:51 +1200 Subject: [PATCH] Import patches-unapplied version 2.535 to ubuntu/cosmic-proposed Imported using git-ubuntu import. Changelog parent: b7072174dcf37fee070c84c2269a45a3b0ce187b New changelog entries: * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. (LP: #1783129) --- .subiquity/subiquity-debug.log | 5 +++++ debian/changelog | 8 ++++++++ live-build/auto/build | 2 +- live-build/auto/config | 7 ++++--- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 .subiquity/subiquity-debug.log diff --git a/.subiquity/subiquity-debug.log b/.subiquity/subiquity-debug.log new file mode 100644 index 00000000..15c9e51f --- /dev/null +++ b/.subiquity/subiquity-debug.log @@ -0,0 +1,5 @@ +2018-06-12 10:15:24,458 subiquity:107 Starting SUbiquity v0.0.5 +2018-06-12 10:15:24,458 subiquity:108 Arguments passed: ['/home/mwhudson/src/subiquity/subiquity/__main__.py', '--dry-run', '--machine-config', 'examples/mwhudson.json', '--screens', 'Filesystem', '--uefi', '--click', 'Use', '--click', 'Cru'] +2018-06-12 10:15:24,458 subiquitycore.utils:30 Checking environment for installer requirements... +2018-06-12 10:15:24,461 subiquitycore.utils:81 FAIL: /usr/bin/curtin is not found on the filesystem +2018-06-12 10:15:24,461 subiquitycore.prober:40 User specified machine_config: examples/mwhudson.json diff --git a/debian/changelog b/debian/changelog index 6a426743..0442d2b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.535) 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 Fri, 24 Aug 2018 13:04:51 +1200 + livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] 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 821977df..4d492d31 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 + touch config/universe-enabled ;; *) PREINSTALLED=true @@ -213,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