livecd-rootfs

Merge lp://qastaging/~vorlon/livecd-rootfs/image-flavors into lp://qastaging/livecd-rootfs

Proposed by Steve Langasek on 2017-02-07

Status:	Merged
Merged at revision:	1462
Proposed branch:	lp://qastaging/~vorlon/livecd-rootfs/image-flavors
Merge into:	lp://qastaging/livecd-rootfs
Diff against target:	117 lines (+53/-1) (has conflicts) 6 files modified debian/changelog (+3/-0) live-build/ubuntu-cpc/hooks/032-root-squashfs.binary (+9/-0) live-build/ubuntu-cpc/hooks/040-qcow2-image.binary (+9/-0) live-build/ubuntu-cpc/hooks/040-vmdk-image.binary (+9/-0) live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary (+14/-1) live-build/ubuntu-cpc/hooks/042-vagrant.binary (+9/-0) Text conflict in live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
To merge this branch:	bzr merge lp://qastaging/~vorlon/livecd-rootfs/image-flavors
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Dan Watkins (community)	2017-02-07	Approve on 2017-02-07
Adam Conrad	2017-02-07	Pending
Review via email: mp+316530@code.qastaging.launchpad.net

Revision history for this message

Dan Watkins (oddbloke) wrote on 2017-02-07:

LGTM

review: Approve

1459. By Steve Langasek on 2017-02-07: Always export LB_IMAGE_FLAVORS, so that hooks don't complain about unbound variables
1460. By Steve Langasek on 2017-02-07: Per discussion with Adam, don't make this an LB_ variable since it's not actually part of live-build; instead we will look to pass it into the environment through launchpad-buildd
1461. By Steve Langasek on 2017-02-07: vmdk-ova has to key on the vmdk image build
1462. By Steve Langasek on 2017-02-08: Also make squashfs skippable with $IMAGE_TARGETS
1463. By Steve Langasek on 2017-02-08: merge from trunk