diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2012-01-12 14:23:19 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:21 +0000 |
| commit | e7a31cf67d13e0cb6948f8f4c4f535aba11fe4fb (patch) | |
| tree | 81466c710c949284c2f6d993af37188f1b374f7a /scripts | |
| parent | a521f9d6791d5245433e843897436efac3fe34ff (diff) | |
| download | ast2050-yocto-poky-e7a31cf67d13e0cb6948f8f4c4f535aba11fe4fb.zip ast2050-yocto-poky-e7a31cf67d13e0cb6948f8f4c4f535aba11fe4fb.tar.gz | |
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
(From OE-Core rev: d32c15b9b09e49cb79028f59b493d478f00d4019)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/runqemu-internal | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index c55619b..11dda55 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 |
