Patchwork scripts/runqemu: Make it run on ubuntu 11.10

login
register
mail settings
Submitter Khem Raj
Date Aug. 8, 2011, 6:30 a.m.
Message ID <1312785002-3627-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/9501/
State New, archived
Headers show

Comments

Khem Raj - Aug. 8, 2011, 6:30 a.m.
location of libGL has moved in ubuntu 11.10
so we look for it in the new locations

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 scripts/runqemu |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Saul Wold - Aug. 11, 2011, 9:29 p.m.
On 08/07/2011 11:30 PM, Khem Raj wrote:
> location of libGL has moved in ubuntu 11.10
> so we look for it in the new locations
>
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   scripts/runqemu |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 9611c64..2b8e88a 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -388,6 +388,7 @@ libgl='no'
>
>   test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so&&  libgl='yes'
>   test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so&&  libgl='yes'
> +test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so&&  libgl='yes'
>
>   if [ "$libgl" != 'yes' ]; then
>       echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 9611c64..2b8e88a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -388,6 +388,7 @@  libgl='no'
 
 test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
 test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
 
 if [ "$libgl" != 'yes' ]; then
     echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.