Patchwork [1/1] runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10

login
mail settings
Submitter Zhai, Edwin
Date Jan. 12, 2012, 12:57 p.m.
Message ID <0ffd87a287912fbfdc51ac9e139cbd4a089b7314.1326372828.git.edwin.zhai@intel.com>
Download mbox | patch
Permalink /patch/19167/
State Accepted
Commit d32c15b9b09e49cb79028f59b493d478f00d4019
Headers show

Comments

Zhai, Edwin - Jan. 12, 2012, 12:57 p.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 2968ed9..aaf776a 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