diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-10 10:07:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:53:56 +0100 |
commit | 9e5bce826abe2e50dd7395c2b26d84fe0edaf45c (patch) | |
tree | f3373821e5c8c3923a8125fa193f98d65a906106 /scripts/runqemu | |
parent | e21c59e020bd16d8f3395dd9a9c7d1431c495771 (diff) | |
download | poky-9e5bce826abe2e50dd7395c2b26d84fe0edaf45c.tar.gz |
runqemu: Fix running qemu when build without gl
When gl is disabled in PACKAGECONFIG then we dont need
to check for supporting libs to be present before running
qemu.
(From OE-Core rev: 6612873dc59054e6d37fa7488226218bfb759127)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 650d1df806..7454dd4a16 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -387,20 +387,6 @@ echo "FSTYPE: [$FSTYPE]" | |||
387 | setup_sysroot | 387 | setup_sysroot |
388 | # OECORE_NATIVE_SYSROOT is now set for all cases | 388 | # OECORE_NATIVE_SYSROOT is now set for all cases |
389 | 389 | ||
390 | # We can't run without a libGL.so | ||
391 | libgl='no' | ||
392 | |||
393 | [ -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so ] && libgl='yes' | ||
394 | [ -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so ] && libgl='yes' | ||
395 | [ -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so ] && libgl='yes' | ||
396 | |||
397 | if [ "$libgl" != 'yes' ]; then | ||
398 | echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator. | ||
399 | Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev. | ||
400 | Fedora package names are: mesa-libGL-devel mesa-libGLU-devel." | ||
401 | exit 1; | ||
402 | fi | ||
403 | |||
404 | INTERNAL_SCRIPT="$0-internal" | 390 | INTERNAL_SCRIPT="$0-internal" |
405 | if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then | 391 | if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then |
406 | INTERNAL_SCRIPT=`which runqemu-internal` | 392 | INTERNAL_SCRIPT=`which runqemu-internal` |