From e7a31cf67d13e0cb6948f8f4c4f535aba11fe4fb Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 12 Jan 2012 14:23:19 +0800 Subject: 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 Signed-off-by: Richard Purdie --- scripts/runqemu-internal | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'scripts/runqemu-internal') diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index c55619baa5..11dda5582e 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 -- cgit v1.2.3-54-g00ecf