Merge powerpc fixes from Daniel Watkins

debian/changelog

@@ -1,7 +1,11 @@
 livecd-rootfs (2.396) UNRELEASED; urgency=medium
 
+  [ Adam Conrad ]
   * Remove obsolete pvr-omap4 special-casing to simplify configs.
 
+  [ Daniel Watkins ]
+  * Enable building of powerpc cloud images.
+
  -- Adam Conrad <adconrad@ubuntu.com>  Sun, 03 Apr 2016 02:39:50 -0600
 
 livecd-rootfs (2.395) xenial; urgency=medium

live-build/auto/config

@@ -470,6 +470,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"

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)

live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary

@@ -1,7 +1,11 @@
 #!/bin/bash -eux
-if [ "$ARCH" != "ppc64el" ]; then
+case $ARCH in
+    ppc64el|powerpc)
+        ;;
+    *)
         exit 0
-fi
+        ;;
+esac
 
 . /build/config/functions
 

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
 		;;