From 100814c6b76ef159f96c51a449652faa69dd3e3a Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 29 Aug 2012 12:53:11 +0200 Subject: [PATCH] Import patches-unapplied version 2.80 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: edd37a1bb5f9eb7ab60a7cf8e4de3031bf94b323 New changelog entries: * 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 --- debian/changelog | 8 ++++++++ live-build/auto/config | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 746a342e..e0b4f8b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 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 diff --git a/live-build/auto/config b/live-build/auto/config index b43ed96f..53a45fc6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -274,7 +274,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)