If a subarch is specified for a cloud image build, don't build rootfs

artifacts; these should come from the 'generic' build.

debian/changelog

@@ -11,6 +11,8 @@ livecd-rootfs (2.376) UNRELEASED; urgency=medium
     all flavors and archs, but at the moment it's only needed on armhf+raspi2
     to work around the raspberrypi2-firmware postinst calling sync, which is
     actually warranted in the normal case.
+  * If a subarch is specified for a cloud image build, don't build rootfs
+    artifacts; these should come from the 'generic' build.
 
  -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 04 Feb 2016 17:31:18 +0100
 

live-build/ubuntu-cpc/hooks/030-root-tarball.binary

@@ -1,4 +1,10 @@
 #!/bin/bash -ex
+
+if [ -n "$SUBARCH" ]; then
+	echo "Skipping rootfs build for subarch flavor build"
+	exit 0
+fi
+
 mkdir binary/boot/filesystem.dir
 
 cp -a chroot/* binary/boot/filesystem.dir

live-build/ubuntu-cpc/hooks/031-root-xz.binary

@@ -3,6 +3,10 @@
 #
 # Generate the rootfs.tar.gz and manifest
 
+if [ -n "$SUBARCH" ]; then
+	exit 0
+fi
+
 dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest
 
 (cd "binary/boot/filesystem.dir/" && tar -c *) | \

live-build/ubuntu-cpc/hooks/032-root-squashfs.binary

@@ -3,6 +3,10 @@
 #
 # Generate a squashfs root and manifest
 
+if [ -n "$SUBARCH" ]; then
+	exit 0
+fi
+
 apt-get -qqy install squashfs-tools
 
 squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"