From bfcc963d8bec6226ea6d5fe159e5d196743a51f3 Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Thu, 25 May 2017 20:35:29 -0500
Subject: [PATCH] ubuntu-cpc: Enable building of powerpc cloud images.

---
 debian/changelog                                       |  7 +++++++
 live-build/auto/config                                 |  4 ++++
 live-build/ubuntu-cpc/hooks/032-disk-image.binary      |  4 ++--
 .../ubuntu-cpc/hooks/034-disk-image-ppc64el.binary     | 10 +++++++---
 live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot       |  2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 124a8f3c..9d6ada68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.209.16) trusty; urgency=medium
+
+  [ Daniel Watkins ]
+  * Enable building of powerpc cloud images.
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Tue, 24 May 2017 14:31:47 -0500
+
 livecd-rootfs (2.209.15) trusty; urgency=medium
 
   [ Ben Howard ]
diff --git a/live-build/auto/config b/live-build/auto/config
index a827450c..3889e49d 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -414,6 +414,10 @@ case $PROJECT in
 			ppc64el)
 				add_task install server
 				;;
+			powerpc)
+				KERNEL_FLAVOURS=powerpc64-smp
+				add_task install server
+				;;
 		esac
 		OPTS="${OPTS:+$OPTS }--system=normal"
 		OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index cebf681a..a17f5631 100644
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -8,8 +8,8 @@ BOOT_MOUNTPOINT=
 ROOTPART_START=1
 
 case $ARCH:$SUBARCH in
-	ppc64el:*)
-		echo "ppc64el disk images are handled separately"
+	ppc64el:*|powerpc:*)
+		echo "POWER disk images are handled separately"
 		exit 0
 		;;
 	armhf:raspi2)
diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
index 6a7c85a2..d085ba38 100644
--- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
+++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
@@ -1,7 +1,11 @@
 #!/bin/bash -eux
-if [ "$ARCH" != "ppc64el" ]; then
-    exit 0
-fi
+case $ARCH in
+    ppc64el|powerpc)
+        ;;
+    *)
+        exit 0
+        ;;
+esac
 
 . /build/config/functions
 
diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
index b8c8f9d0..815d946d 100644
--- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
@@ -173,7 +173,7 @@ case $arch in
 	i386|amd64)
 		add_serial_console ttyS0
 		;;
-	ppc64el)
+	powerpc|ppc64el)
 		add_serial_console hvc0
 		exit 0
 		;;