summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu14
-rwxr-xr-xscripts/runqemu-internal17
2 files changed, 17 insertions, 14 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 650d1df..7454dd4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -387,20 +387,6 @@ echo "FSTYPE: [$FSTYPE]"
387setup_sysroot 387setup_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
391libgl='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
397if [ "$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;
402fi
403
404INTERNAL_SCRIPT="$0-internal" 390INTERNAL_SCRIPT="$0-internal"
405if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then 391if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then
406INTERNAL_SCRIPT=`which runqemu-internal` 392INTERNAL_SCRIPT=`which runqemu-internal`
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index a21ea93..eeadb24 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -468,6 +468,23 @@ if [ ! -x "$QEMUBIN" ]; then
468 return 468 return
469fi 469fi
470 470
471NEED_GL=`ldd $QEMUBIN/$QEMU 2>&1 | grep libGLU`
472# We can't run without a libGL.so
473if [ "$NEED_GL" != "" ]; then
474 libgl='no'
475
476 [ -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so ] && libgl='yes'
477 [ -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so ] && libgl='yes'
478 [ -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so ] && libgl='yes'
479
480 if [ "$libgl" != 'yes' ]; then
481 echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
482 Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.
483 Fedora package names are: mesa-libGL-devel mesa-libGLU-devel."
484 exit 1;
485 fi
486fi
487
471do_quit() { 488do_quit() {
472 if [ -n "$PIDFILE" ]; then 489 if [ -n "$PIDFILE" ]; then
473 #echo kill `cat $PIDFILE` 490 #echo kill `cat $PIDFILE`