From f0cb85a506e904f3c99c11ac9a109b790f27e18a Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Fri, 29 Sep 2017 15:20:14 -0400
Subject: [PATCH] When SUBPROJECT environment variable is not set assume it to
 be ""

---
 live-build/auto/build                         |  8 ++---
 live-build/auto/config                        | 30 +++++++++----------
 .../ubuntu-cpc/hooks/032-disk-image.binary    |  2 +-
 .../hooks/033-disk-image-uefi.binary          |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index aa67ef7b..71d7bd56 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -45,13 +45,13 @@ Expire-Date: 0
 
 	lb bootstrap "$@"
 
-	if [ "$SUBPROJECT" = minimized ] \
+	if [ "${SUBPROJECT:-}" = minimized ] \
 	   && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then
 		# workaround for tzdata purge not removing these files
 		rm -f chroot/etc/localtime chroot/etc/timezone
 	fi
 
-	if [ "$SUBPROJECT" = minimized ]; then
+	if [ "${SUBPROJECT:-}" = minimized ]; then
 		# set up dpkg filters to skip installing docs on minimizedd system
 		mkdir -p chroot/etc/dpkg/dpkg.cfg.d
 		cat > chroot/etc/dpkg/dpkg.cfg.d/excludes <<EOF
@@ -385,7 +385,7 @@ elif [ -e binary-tar.tar.gz ]; then
 	cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
 fi
 
-if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
+if [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-core:system-image" ]; then
     if [ -e "binary/$INITFS/filesystem.dir" ]; then
         rootfs="binary/$INITFS/filesystem.dir"
 
@@ -436,7 +436,7 @@ fi
 # ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so
 # at this point we reset it to "none" as all the work to extract it was done already
 # in a binary hook
-case $PROJECT:$SUBPROJECT in
+case $PROJECT:${SUBPROJECT:-} in
         ubuntu-core:system-image|ubuntu-desktop-next:system-image)
 
     # create device tarball (for snappy only atm)
diff --git a/live-build/auto/config b/live-build/auto/config
index 3bf7c604..afeca134 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -107,7 +107,7 @@ add_binary_hook ()
 }
 
 if [ -z "${IMAGEFORMAT:-}" ]; then
-	case $PROJECT:$SUBPROJECT in
+	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*)
 			IMAGEFORMAT=ext4
 			;;
@@ -121,7 +121,7 @@ case $IMAGEFORMAT in
 	ext2|ext3|ext4)
 		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
 		PREINSTALLED=true
-		case $SUBPROJECT in
+		case ${SUBPROJECT:-} in
 			wubi)
 				add_package install lupin-support
 				COMPONENTS='main restricted universe multiverse'
@@ -140,7 +140,7 @@ case $IMAGEFORMAT in
 
 	plain)
 		INITRAMFS_TYPE=none
-		case $PROJECT:$SUBPROJECT in
+		case $PROJECT:${SUBPROJECT:-} in
 			ubuntu-server:live)
 				add_package live lupin-casper
 				INITRAMFS_TYPE=auto
@@ -238,7 +238,7 @@ esac
 
 SIGNED_KERNEL_PACKAGE="linux-signed-generic"
 
-if [ "$SUBPROJECT" = minimized ]; then
+if [ "${SUBPROJECT:-}" = minimized ]; then
 	OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 fi
 
@@ -265,7 +265,7 @@ case $PROJECT in
 		#      CDIMAGE_PREINSTALLED is not passed from build.py
 		#      and PREINSTALLED means something different. So
 		#      we use SUBPROJECT to pass on the information
-		if [ "$SUBPROJECT" = "system-image" ]; then
+		if [ "${SUBPROJECT:-}" = "system-image" ]; then
 			OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
 		fi
 		;;
@@ -419,7 +419,7 @@ case $PROJECT in
 
 	ubuntu-server)
 		add_task install minimal
-		case $SUBPROJECT in
+		case ${SUBPROJECT:-} in
 			live)
 				add_task install standard
 				add_task install server
@@ -510,7 +510,7 @@ case $PROJECT in
 		# SUBPROJECT, but it's a handy thing that launchpad-buildd
 		# already passes through to us that we weren't otherwise
 		# using here.
-		case $SUBPROJECT in
+		case ${SUBPROJECT:-} in
 		    ubuntu-rtm/dogfood)
 			MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/
 			OPTS="${OPTS:+$OPTS }--apt-secure false"
@@ -528,7 +528,7 @@ case $PROJECT in
 		;;
 
 	ubuntu-cpc)
-		if [ "$SUBPROJECT" = minimized ]; then
+		if [ "${SUBPROJECT:-}" = minimized ]; then
 			add_task install cloud-image
 			add_package install sudo
 		else
@@ -638,7 +638,7 @@ case $ARCH in
 		;;
 esac
 
-case $PROJECT:$SUBPROJECT in
+case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-server:live)
 		;;
 	ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
@@ -662,7 +662,7 @@ case $PROJECT in
 		;;
 esac
 
-case $SUBPROJECT in
+case ${SUBPROJECT:-} in
 	wubi)
 		add_binary_hook build-wubildr
 		;;
@@ -688,10 +688,10 @@ lb config noauto \
 	"$@"
 
 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
-echo "SUBPROJECT=\"$SUBPROJECT\"" >> config/chroot
+echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
 echo "BUILDSTAMP=\"$NOW\"" >> config/binary
-echo "SUBPROJECT=\"$SUBPROJECT\"" >> config/binary
+echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
 
 case $ARCH+$SUBARCH in
 	armhf+raspi2)
@@ -768,7 +768,7 @@ EOF
 		;;
 esac
 
-if [ $PROJECT = ubuntu-server ] && [ $SUBPROJECT != live ]; then
+if [ $PROJECT = ubuntu-server ] && [ ${SUBPROJECT:-} != live ]; then
 	cat > config/hooks/100-remove-fstab.chroot <<EOF
 #! /bin/sh
 rm -f /etc/fstab
@@ -804,7 +804,7 @@ EOF
 	      config/archives/proposed.list.binary
 fi
 
-case $PROJECT:$SUBPROJECT in
+case $PROJECT:${SUBPROJECT:-} in
 	*-dvd:*)
 		. config/bootstrap
 
@@ -890,7 +890,7 @@ EOF
 	fi
 fi
 
-case $SUBPROJECT in
+case ${SUBPROJECT:-} in
     ubuntu-rtm|ubuntu-rtm/*)
 	# debootstrap doesn't know about ubuntu-rtm series directly.  Rather
 	# than having to teach it, we employ a few hacks to make it use the
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index 0a538102..bb8bfc11 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -121,7 +121,7 @@ if [ "${should_install_grub}" -eq 1 ]; then
 
     rm mountpoint/tmp/device.map
 
-	if [ "$SUBPROJECT" = minimized ] && [ -n "$partuuid" ]; then
+	if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
 		echo "partuuid found for root device; forcing it in Grub"
 		mkdir -p mountpoint/etc/default/grub.d
 		echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid
diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index ca201bb7..932484ea 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -62,7 +62,7 @@ install_grub() {
     efi_boot_dir="/boot/efi/EFI/BOOT"
     chroot mountpoint mkdir -p "${efi_boot_dir}"
 
-    if [ "$SUBPROJECT" = minimized ] && [ -n "$partuuid" ]; then
+    if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
         # FIXME: code duplicated between 032-disk-image.binary
         # and 033-disk-image-uefi.binary.  We want to fix this to not
         # have initramfs-tools installed at all on these images.