[oe-commits] Zhai Edwin : runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d32c15b9b09e49cb79028f59b493d478f00d4019
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d32c15b9b09e49cb79028f59b493d478f00d4019

Author: Zhai Edwin <edwin.zhai at intel.com>
Date:   Thu Jan 12 14:23:19 2012 +0800

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 at intel.com>

---

 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