From: Zhai Edwin <edwin.z...@intel.com>
>From 11.10, libGL.so is installed @ /usr/lib/x86_64-linux-gnu/ in 64b Ubuntu.
[YOCTO #1885] got fixed
Signed-off-by: Zhai Edwin <edwin.z...@intel.com>
---
scripts/runqemu-internal | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2968ed9..aaf776a 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -472,8 +472,17 @@ EOM
# Automatically use Ubuntu system's mesa libGL, other distro can add its own
path
if grep -i ubuntu /etc/lsb-release &> /dev/null
then
+ GL_PATH=""
+ if test -e /usr/lib/libGL.so
+ then
+ GL_PATH="/usr/lib/libGL.so"
+ elif test -e /usr/lib/x86_64-linux-gnu/libGL.so
+ then
+ GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so"
+ fi
+
echo "Skip nVidia's libGL on Ubuntu!"
- GL_LD_PRELOAD="/usr/lib/libGL.so $LD_PRELOAD"
+ GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD"
fi
fi
--
1.7.1
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
