Merge lp:~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal into lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed

Proposed by Chris Glass
Status: Merged
Merged at revision: 1455
Proposed branch: lp:~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed
Diff against target: 33 lines (+13/-1)
2 files modified
debian/changelog (+7/-0)
live-build/auto/build (+6/-1)
To merge this branch: bzr merge lp:~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+342301@code.launchpad.net

This proposal supersedes a proposal from 2018-03-28.

Description of the change

This change backports changes from bionic where the /etc/cloud/build.info file gets properly filled with a "minimal" build type instead of the generic "server" type when building cloud-images.

To post a comment you must log in.

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-03-20 20:10:44 +0000
3+++ debian/changelog 2018-03-28 13:28:40 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.408.29) UNRELEASED; urgency=medium
6+
7+ * ubuntu-cpc: When performing a minimized build make sure the
8+ /etc/cloud/build.info file says "minimal" (LP: #1759519)
9+
10+ -- Christopher Glass (Ubuntu) <tribaal@ubuntu.com> Wed, 28 Mar 2018 12:08:48 +0200
11+
12 livecd-rootfs (2.408.28) xenial; urgency=medium
13
14 * ubuntu-cpc: When performing a minimized build, don't generate artifacts
15
16=== modified file 'live-build/auto/build'
17--- live-build/auto/build 2017-11-10 17:41:57 +0000
18+++ live-build/auto/build 2018-03-28 13:28:40 +0000
19@@ -305,8 +305,13 @@
20 fi
21 fi
22 if [ "$PROJECT" = "ubuntu-cpc" ]; then
23+ if [ "${SUBPROJECT:-}" = minimized ]; then
24+ BUILD_NAME=minimal
25+ else
26+ BUILD_NAME=server
27+ fi
28 cat > chroot/etc/cloud/build.info << EOF
29-build_name: server
30+build_name: $BUILD_NAME
31 serial: $BUILDSTAMP
32 EOF
33 fi

Subscribers

People subscribed via source and target branches