Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-28 03:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.535 to ubuntu/cosmic-proposed

Browse Source 
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: )
This commit is contained in:
Michael Hudson-Doyle 2018-08-24 13:04:51 +12:00 committed by usd-importer
parent b7072174dc
commit 61b74940ea
4 changed files with 18 additions and 4 deletions
.subiquity
subiquity-debug.log
debian
changelog
live-build/auto
buildconfig

5
.subiquity/subiquity-debug.log Normal file

@ -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

8
debian/changelog vendored

@ -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 <michael.hudson@ubuntu.com> Fri, 24 Aug 2018 13:04:51 +1200
livecd-rootfs (2.534) cosmic; urgency=medium
[ Michael Hudson-Doyle ]

2
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

7
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