[PATCH 0/2] Make qemu & runqemu detect libgl on Debian

[PATCH 0/2] Make qemu & runqemu detect libgl on Debian

[Anders Darander]

Modify the patches to make qemu-native compile and run on Ubuntu 11.10, to use
a wildcard match instead of `uname -i`. The latter only returns unknown on
e.g. Debian.

These patches are similar to what we did for perl-native in the
Configure-multilib.patch (commit id 9260c1b9d04a88d15ab5376c7cd56f381fe3e53b
in oe-core).

The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:

  distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)

are available in the git repository at:
  git://github.com/darander/oe-core qemu-native
  https://github.com/darander/oe-core/tree/qemu-native

Anders Darander (2):
  qemu: modify search paths for libgl
  scripts/runqemu: modify search paths for libgl

 meta/recipes-devtools/qemu/qemu.inc |    2 +-
 scripts/runqemu                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.5.4

[PATCH 1/2] qemu: modify search paths for libgl

[Anders Darander]

On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-devtools/qemu/qemu.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 85476d6..8a1e934 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,7 +26,7 @@ do_configure_prepend_virtclass-native() {
 
     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'
+    test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
 
     test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
 
-- 
1.7.5.4

[PATCH 2/2] scripts/runqemu: modify search paths for libgl

[Anders Darander]

On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 2b8e88a..ed8c05b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -388,7 +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'
+test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-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.
-- 
1.7.5.4

Re: [PATCH 0/2] Make qemu & runqemu detect libgl on Debian

[Saul Wold]

On 08/17/2011 06:30 AM, Anders Darander wrote:
>
> Modify the patches to make qemu-native compile and run on Ubuntu 11.10, to use
> a wildcard match instead of `uname -i`. The latter only returns unknown on
> e.g. Debian.
>
> These patches are similar to what we did for perl-native in the
> Configure-multilib.patch (commit id 9260c1b9d04a88d15ab5376c7cd56f381fe3e53b
> in oe-core).
>
> The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
>
>    distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
>
> are available in the git repository at:
>    git://github.com/darander/oe-core qemu-native
>    https://github.com/darander/oe-core/tree/qemu-native
>
> Anders Darander (2):
>    qemu: modify search paths for libgl
>    scripts/runqemu: modify search paths for libgl
>
>   meta/recipes-devtools/qemu/qemu.inc |    2 +-
>   scripts/runqemu                     |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!