From patchwork Tue Jan 17 08:32:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 31/62] runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10 Date: Tue, 17 Jan 2012 08:32:16 -0000 From: Saul Wold X-Patchwork-Id: 19559 Message-Id: <0425f4dd12d84e3d9378a55d6c5d1c744f595047.1326786990.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Zhai Edwin >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 --- 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