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

[Steve Langasek]

[lp:~vorlon/livecd-rootfs/image-flavors]

1458. By Steve Langasek on 2017-02-07

Fix gratuitous quoting bug

[Dan Watkins (oddbloke)]

LGTM

review: Approve

[lp:~vorlon/livecd-rootfs/image-flavors]

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

[lp:~vorlon/livecd-rootfs/image-flavors]

1464. By Steve Langasek on 2017-02-28

fix the changelog to match the implementation, thanks to Colin for catching

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-17 22:30:31 +0000
+++ debian/changelog	2017-02-28 06:31:36 +0000
@@ -7,6 +7,9 @@
   * live-build/ubuntu-cpc/functions: umount_partition: don't call
     umount_settle for each submount; just unmount them one by one and
     settle at the end.
+  * Support passing IMAGE_TARGETS in the environment, to limit which images
+    are output as part of a build; particularly useful for ubuntu-cpc builds
+    which output multiple image types.
 
   [ Nishanth Aravamudan ]
   * live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot: generate iSCSI

=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-02-28 06:31:36 +0000
@@ -3,6 +3,15 @@
 #
 # Generate a squashfs root and manifest
 
+case $IMAGE_TARGETS in
+	""|*squashfs*)
+		;;
+	*)
+		echo "Skipping squashfs build"
+		exit 0
+		;;
+esac
+
 if [ -n "$SUBARCH" ]; then
 	echo "Skipping rootfs build for subarch flavor build"
 	exit 0

=== modified file 'live-build/ubuntu-cpc/hooks/040-qcow2-image.binary'
--- live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2017-02-28 06:31:36 +0000
@@ -1,5 +1,14 @@
 #!/bin/bash -ex
 
+case $IMAGE_TARGETS in
+	""|*qcow2*)
+		;;
+	*)
+		echo "Skipping qcow2 image build"
+		exit 0
+		;;
+esac
+
 case $ARCH:$SUBARCH in
 	# Not sure if any other cloud images use subarch for something that
 	# should take qcow2 format, so only skipping this on raspi2 for now.

=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2017-02-28 06:31:36 +0000
@@ -9,6 +9,15 @@
                      exit 0;;
 esac
 
+case ${IMAGE_TARGETS:-} in
+	""|*vmdk*)
+		;;
+	*)
+		echo "Skipping VMDK image build"
+		exit 0
+		;;
+esac
+
 . /build/config/functions
 
 if [ -e binary/boot/disk-uefi.ext4 ]; then

=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2017-02-16 17:04:07 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2017-02-28 06:31:36 +0000
@@ -26,7 +26,20 @@
             echo "OVA images are not supported for $ARCH yet.";
             exit 0;;
 esac
-
+<<<<<<< TREE
+
+=======
+
+case ${IMAGE_TARGETS:-} in
+	""|*vmdk*)
+		;;
+	*)
+		echo "Skipping OVA image build"
+		exit 0
+		;;
+esac
+
+>>>>>>> MERGE-SOURCE
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-02-16 17:04:07 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-02-28 06:31:36 +0000
@@ -15,6 +15,15 @@
 # some packages in it, convert it to a vmdk, and then assemble the vagrant
 # box.
 
+case $IMAGE_TARGETS in
+	""|*vagrant*)
+		;;
+	*)
+		echo "Skipping Vagrant image build"
+		exit 0
+		;;
+esac
+
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))