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
=== modified file 'debian/changelog'
--- debian/changelog 2018-03-20 20:10:44 +0000
+++ debian/changelog 2018-03-28 13:28:40 +0000
@@ -1,3 +1,10 @@
1livecd-rootfs (2.408.29) UNRELEASED; urgency=medium
2
3 * ubuntu-cpc: When performing a minimized build make sure the
4 /etc/cloud/build.info file says "minimal" (LP: #1759519)
5
6 -- Christopher Glass (Ubuntu) <tribaal@ubuntu.com> Wed, 28 Mar 2018 12:08:48 +0200
7
1livecd-rootfs (2.408.28) xenial; urgency=medium8livecd-rootfs (2.408.28) xenial; urgency=medium
29
3 * ubuntu-cpc: When performing a minimized build, don't generate artifacts10 * ubuntu-cpc: When performing a minimized build, don't generate artifacts
411
=== modified file 'live-build/auto/build'
--- live-build/auto/build 2017-11-10 17:41:57 +0000
+++ live-build/auto/build 2018-03-28 13:28:40 +0000
@@ -305,8 +305,13 @@
305 fi305 fi
306 fi306 fi
307 if [ "$PROJECT" = "ubuntu-cpc" ]; then307 if [ "$PROJECT" = "ubuntu-cpc" ]; then
308 if [ "${SUBPROJECT:-}" = minimized ]; then
309 BUILD_NAME=minimal
310 else
311 BUILD_NAME=server
312 fi
308 cat > chroot/etc/cloud/build.info << EOF313 cat > chroot/etc/cloud/build.info << EOF
309build_name: server314build_name: $BUILD_NAME
310serial: $BUILDSTAMP315serial: $BUILDSTAMP
311EOF316EOF
312 fi317 fi

Subscribers

People subscribed via source and target branches