merge 2.80

debian/changelog

@@ -1,9 +1,17 @@
-livecd-rootfs (2.80) UNRELEASED; urgency=low
+livecd-rootfs (2.81) UNRELEASED; urgency=low
 
   * live-build/auto/config: Disable zsync for BINARYFORMAT=iso*|usb* builds.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Thu, 30 Aug 2012 23:38:27 +0100
 
+livecd-rootfs (2.80) quantal; urgency=low
+
+  * add pvr-omap4 driver to omap4 image builds for everything but
+    ubuntu-server, ubuntu-core and base images so we have GLES working
+    out of the box on them
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 Aug 2012 12:53:11 +0200
+
 livecd-rootfs (2.79) quantal; urgency=low
 
   * setting --architectures seems to have weird side effects on arm

live-build/auto/config

@@ -275,7 +275,14 @@ case $ARCH in
 				BINARY_REMOVE_LINUX=false
 				;;
 			omap4)
-				add_package install u-boot-linaro-omap4-panda u-boot-tools
+				case $PROJECT in
+					ubuntu-server|ubuntu-core|base)
+						add_package install u-boot-linaro-omap4-panda u-boot-tools
+						;;
+					*)
+						add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4
+						;;
+				esac
 				BINARY_REMOVE_LINUX=false
 				;;
 			mx5)