Merge lp:~oddbloke/livecd-rootfs/minimized-skips into lp:livecd-rootfs

[Dan Watkins]

[Steve Langasek (vorlon)]

review: Approve

[lp:~oddbloke/livecd-rootfs/minimized-skips]

1643. By Steve Langasek on 2018-03-20

Merge lp:~daniel-thewatkins/livecd-rootfs/minimized-skips

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-16 18:38:22 +0000
+++ debian/changelog	2018-03-20 18:31:42 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.512) bionic; urgency=medium
+
+  * ubuntu-cpc: When performing a minimized build, don't generate artifacts
+    that won't boot with the linux-kvm kernel (LP: #1757223).
+
+ -- Daniel Watkins <[e-mail]>  Tue, 20 Mar 2018 13:42:50 -0400
+
 livecd-rootfs (2.511) bionic; urgency=medium
 
   * Whitelist preserving "unowned" /var/log/journal. Maybe systemd package

=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2018-02-05 15:37:52 +0000
+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2018-03-20 18:31:42 +0000
@@ -3,6 +3,15 @@
 #
 # Generate VMDK files
 
+case ${SUBPROJECT:-} in
+    minimized)
+        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
+        exit 0
+        ;;
+    *)
+        ;;
+esac
+
 case $ARCH in
          amd64) ;;
                   *) echo "VMDK images are not supported for $ARCH yet.";

=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2018-02-05 15:37:52 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2018-03-20 18:31:42 +0000
@@ -9,6 +9,15 @@
 #
 # For this step, we re-use the VMDK's made in 040-vmdk-image.binary
 
+case ${SUBPROJECT:-} in
+    minimized)
+        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
+        exit 0
+        ;;
+    *)
+        ;;
+esac
+
 
 # Switch on $ARCH to determine which ID and description to use in the produced
 # OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2018-02-05 15:37:52 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2018-03-20 18:31:42 +0000
@@ -15,6 +15,15 @@
 # some packages in it, convert it to a vmdk, and then assemble the vagrant
 # box.
 
+case ${SUBPROJECT:-} in
+    minimized)
+        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
+        exit 0
+        ;;
+    *)
+        ;;
+esac
+
 case $IMAGE_TARGETS in
 	""|*vagrant*)
 		;;