Merge lp:~laney/livecd-rootfs/omap4-install-reverted-stack into lp:livecd-rootfs

[Iain Lane]

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.

I'm wondering if I should do either or both of

  - Collapse the case into a single case "$ARCH+$SUBARCH" statement since it only cases for armhf+omap4
  - Combine the add_package call with the existing place it's used further on in the script

Let me know what you think.

[Colin Watson (cjwatson)]

I would be inclined to do the first but not the second. Otherwise this looks good to me.

review: Approve

[lp:~laney/livecd-rootfs/omap4-install-reverted-stack]

780. By Iain Lane on 2013-07-16

Collapse case statement into one for $ARCH+$SUBARCH since it only checks for armhf+omap4

[Iain Lane (laney)]

> I would be inclined to do the first but not the second. Otherwise this looks
> good to me.

Cheers, done. I'll upload now.

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2013-07-12 09:05:35 +0000
+++ live-build/auto/config	2013-07-16 16:16:30 +0000
@@ -172,7 +172,21 @@
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
-		add_task install minimal standard ubuntu-desktop
+		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 ubuntu-desktop \
+					xserver-xorg-core-omap-revert \
+					xserver-xorg-video-omap-revert \
+					xserver-xorg-input-evdev-omap-revert 
+				;;
+			*)
+				add_task install ubuntu-desktop
+				;;
+		esac
 		LIVE_TASK='ubuntu-live'
 		;;
 
@@ -316,7 +330,7 @@
 						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