Import patches-unapplied version 2.396 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 3061756ecb64747bf12af0dc1b0db390717c07a6

New changelog entries:
  [ Adam Conrad ]
  * Remove obsolete pvr-omap4 special-casing to simplify configs.
  [ Daniel Watkins ]
  * Enable building of powerpc cloud images.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.396) xenial; 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
 
   * create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on

live-build/auto/config

@@ -192,20 +192,7 @@ UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
 		add_package install ubuntu-minimal ubuntu-standard
-		case "$ARCH+$SUBARCH" in
-			armhf+omap4)
-				# Don't use the task as this drags in the regular X
-				# stack (the metapackage doesn't). We want the
-				# "reverted" one.
-				add_package install ubuntu-desktop \
-					xserver-xorg-core-omap-revert \
-					xserver-xorg-video-omap-revert \
-					xserver-xorg-input-evdev-omap-revert 
-				;;
-			*)
-				add_package install ubuntu-desktop $UNITY_HWE_HINTS
-				;;
-		esac
+		add_package install ubuntu-desktop $UNITY_HWE_HINTS
 		LIVE_TASK='ubuntu-live'
 		case $ARCH in
 			amd64)	add_package live $SIGNED_KERNEL_PACKAGE ;;
@@ -233,20 +220,7 @@ case $PROJECT in
 
 	kubuntu|kubuntu-dvd)
 		add_task install minimal standard
-		case "$ARCH+$SUBARCH" in
-			armhf+omap4)
-				# Don't use the task as this drags in the regular X
-				# stack (the metapackage doesn't). We want the
-				# "reverted" one.
-				add_package install kubuntu-desktop \
-					xserver-xorg-core-omap-revert \
-					xserver-xorg-video-omap-revert \
-					xserver-xorg-input-evdev-omap-revert 
-				;;
-			*)
-				add_task install kubuntu-desktop
-				;;
-		esac
+		add_task install kubuntu-desktop
 		LIVE_TASK='kubuntu-live'
 		case $ARCH in
 			amd64)	add_package live linux-signed-generic ;;
@@ -496,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
-    exit 0
-fi
+case $ARCH in
+    ppc64el|powerpc)
+        ;;
+    *)
+        exit 0
+        ;;
+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
 		;;