Patchwork [CONSOLIDATED,PULL,31/62] runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10

login
mail settings
Submitter Saul Wold
Date Jan. 17, 2012, 8:32 a.m.
Message ID <0425f4dd12d84e3d9378a55d6c5d1c744f595047.1326786990.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19559/
State New
Headers show

Comments

Saul Wold - Jan. 17, 2012, 8:32 a.m.
From: Zhai Edwin <edwin.zhai@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.zhai@intel.com>
---
 scripts/runqemu-internal |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

Patch

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