summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-01-12 14:23:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:00 +0000
commitd32c15b9b09e49cb79028f59b493d478f00d4019 (patch)
tree9f6b2ad7c540c54954451a023f6ab03221f7b1f9 /scripts
parentf8d984e485a5bb12f4df8e28e7e0fb0da2a7098e (diff)
downloadopenembedded-core-d32c15b9b09e49cb79028f59b493d478f00d4019.tar.gz
openembedded-core-d32c15b9b09e49cb79028f59b493d478f00d4019.tar.bz2
openembedded-core-d32c15b9b09e49cb79028f59b493d478f00d4019.tar.xz
openembedded-core-d32c15b9b09e49cb79028f59b493d478f00d4019.zip
runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10
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.zhai@intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu-internal11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c55619baa..11dda5582 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