livecd-rootfs

Merge lp:~mwhudson/livecd-rootfs/live-server-universe into lp:livecd-rootfs

  1. live-server-universe
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 1691
Proposed branch: lp:~mwhudson/livecd-rootfs/live-server-universe
Merge into: lp:livecd-rootfs
Diff against target: 53 lines (+13/-4)
3 files modified
debian/changelog (+8/-0)
live-build/auto/build (+1/-1)
live-build/auto/config (+4/-3)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/live-server-universe
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Simon Quigley Approve
Review via email: mp+353272@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This finally looks OK to me now, I'll do some test builds to check though.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

The test builds looked good.

lp:~mwhudson/livecd-rootfs/live-server-universe updated
1697. By Michael Hudson-Doyle

add bug ref to changelog

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Please change the changelog version to not use "~ppa4".

review: Needs Fixing
lp:~mwhudson/livecd-rootfs/live-server-universe updated
1698. By Michael Hudson-Doyle

fix changelog

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

> Please change the changelog version to not use "~ppa4".

Fixed.

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Better, but I don't think I'm qualified to do a more detailed review on this.

Thanks for your work, Michael.

review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

Makes sense from here.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-08-06 20:12:05 +0000
3+++ debian/changelog 2018-08-17 04:15:06 +0000
4@@ -1,3 +1,11 @@
5+livecd-rootfs (2.535) UNRELEASED; urgency=medium
6+
7+ * Disentangle enabling universe in the final image a little from having
8+ PREINSTALLED=true set and enable it for a live-server build.
9+ (LP: #1783129)
10+
11+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 16 Aug 2018 21:28:00 +1200
12+
13 livecd-rootfs (2.534) cosmic; urgency=medium
14
15 [ Michael Hudson-Doyle ]
16
17=== modified file 'live-build/auto/build'
18--- live-build/auto/build 2018-08-02 01:02:13 +0000
19+++ live-build/auto/build 2018-08-17 04:15:06 +0000
20@@ -268,7 +268,7 @@
21 rm -rf chroot/var/lib/apt/lists/*
22 fi
23
24- if [ -f config/oem-config-preinstalled ]; then
25+ if [ -f config/universe-enabled ]; then
26
27 # This is cargo-culted almost verbatim (with some syntax changes for
28 # preinstalled being slightly different in what it doesn't ask) from
29
30=== modified file 'live-build/auto/config'
31--- live-build/auto/config 2018-07-11 20:06:16 +0000
32+++ live-build/auto/config 2018-08-17 04:15:06 +0000
33@@ -151,6 +151,7 @@
34 # by skipping lb_chroot_live-packages.
35 skip_lb_stage chroot_live-packages
36 INITRAMFS_TYPE=auto
37+ touch config/universe-enabled
38 ;;
39 *)
40 PREINSTALLED=true
41@@ -213,9 +214,9 @@
42 esac
43
44 if [ "$PREINSTALLED" = "true" ]; then
45- # This is an oem-config preinstalled image, touch a random file that
46- # we can refer back to during build, cause that's wildly hackish
47- touch config/oem-config-preinstalled
48+ # Touch a random file that we can refer back to during build,
49+ # cause that's wildly hackish
50+ touch config/universe-enabled
51 case $PROJECT in
52 kubuntu*)
53 add_package live oem-config-kde ubiquity-frontend-kde

Subscribers

People subscribed via source and target branches