From 725d1c6ca3fb4779a68a761ad89e93c0895eb2c2 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 16 Jul 2013 16:29:52 +0100
Subject: [PATCH] On armhf+omap4, stop using the ubuntu-desktop task and use
 the metapackage instead

The task pulls in the X stack which the metapackage does not. We can take
advantage of this to install the omap-revert X stack that's needed for these
images.
---
 live-build/auto/config | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index d7c6bbab..6b10a792 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -172,7 +172,28 @@ esac
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
-		add_task install minimal standard ubuntu-desktop
+		add_task install minimal standard
+		case $ARCH in
+			armhf)
+				case $SUBARCH in
+					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_task ubuntu-desktop
+						;;
+				esac
+				;;
+			*)
+				add_task ubuntu-desktop
+				;;
+		esac
 		LIVE_TASK='ubuntu-live'
 		;;
 
@@ -316,7 +337,7 @@ case $ARCH in
 						add_package install u-boot-linaro-omap4-panda u-boot-tools
 						;;
 					*)
-						add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 xserver-xorg-video-omap-revert xserver-xorg-input-evdev-omap-revert
+						add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4
 						;;
 				esac
 				BINARY_REMOVE_LINUX=false