Fix libGL path in 64b Ubuntu 11.10

From: Zhai Edwin <[email protected]>

From 11.10, 64b Ubuntu has a new path for libGL.so. This patch fix it. Thanks,
Edwin

The following changes since commit 19241e7e2d88406c57613180dec9e7896c6674cc:

distro-tracking: Update info for webkit-gtk, web-webkit (2012-01-11 11:01:32 +0800)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (1):
runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10

 scripts/runqemu-internal |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

From: Zhai Edwin <[email protected]>

From 11.10, libGL.so is installed @ /usr/lib/x86_64-linux-gnu/ in 64b Ubuntu.

[YOCTO #1885] got fixed

---
 scripts/runqemu-internal |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

index 2968ed9..aaf776a 100755
@@ -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

Merged into OE-Core

Thanks
Sau!