From 5ac47abce746fe5b0a13821d8a51446044a33195 Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@0c3.net>
Date: Sun, 3 Apr 2016 02:41:30 -0600
Subject: [PATCH] Remove obsolete pvr-omap4 special-casing to simplify configs.

---
 debian/changelog       |  6 ++++++
 live-build/auto/config | 30 ++----------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c90d43d..25631ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.396) UNRELEASED; urgency=medium
+
+  * Remove obsolete pvr-omap4 special-casing to simplify configs.
+
+ -- 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
diff --git a/live-build/auto/config b/live-build/auto/config
index a9b1d5d0..251db0ad 100755
--- a/live-build/auto/config
+++ b/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 ;;