summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu-internal17
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 0f0f799f50..82ef26594c 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -75,7 +75,7 @@ if [ "$MACHINE" = "qemuarm" ]; then
75 RAM=`echo $QEMU_MEMORY | sed 's/M$//'` 75 RAM=`echo $QEMU_MEMORY | sed 's/M$//'`
76 if [[ -z "$RAM" || $RAM -gt 128 ]]; then 76 if [[ -z "$RAM" || $RAM -gt 128 ]]; then
77 echo "WARNING: qemuarm does not support > 128M of RAM." 77 echo "WARNING: qemuarm does not support > 128M of RAM."
78 echo "*** Changing QEMU_MEMORY to default of 128M ***" 78 echo "Changing QEMU_MEMORY to default of 128M."
79 QEMU_MEMORY="128M" 79 QEMU_MEMORY="128M"
80 SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 128/" ` 80 SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 128/" `
81 fi 81 fi
@@ -102,7 +102,7 @@ acquire_lock() {
102 # Check that the lockfile is not stale 102 # Check that the lockfile is not stale
103 ps=`ps -ewwo pid | grep $(cat $lockfile.lock)` 103 ps=`ps -ewwo pid | grep $(cat $lockfile.lock)`
104 if [ -z "$ps" ]; then 104 if [ -z "$ps" ]; then
105 echo "Warning: Stale lock file detected, deleting $lockfile.lock" 105 echo "WARNING: Stale lock file detected, deleting $lockfile.lock."
106 rm -f $lockfile.lock 106 rm -f $lockfile.lock
107 echo $$ > $lockfile.lock 107 echo $$ > $lockfile.lock
108 else 108 else
@@ -439,17 +439,18 @@ if [ -x "$DISTCCD" ]; then
439 PIDFILE=`mktemp` 439 PIDFILE=`mktemp`
440 $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE & 440 $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE &
441else 441else
442 echo "Warning: distccd not present, no distcc support loaded." 442 echo "WARNING: distccd not present, no distcc support loaded."
443fi 443fi
444 444
445# qemu got segfault if linked with nVidia's libgl 445# qemu got segfault if linked with nVidia's libgl
446if ldd $QEMUBIN | grep -i nvidia &> /dev/null 446if ldd $QEMUBIN | grep -i nvidia &> /dev/null
447then 447then
448 echo "************** !!!Warning!!! ************** 448cat << EOM
449 nVidia's proprietary OpenGL libraries are known to have compatibility 449WARNING: nVidia proprietary OpenGL libraries detected.
450 issues with qemu, resulting in a segfault. Please uninstall these 450nVidia's OpenGL libraries are known to have compatibility issues with qemu,
451 drivers or ensure the mesa libGL libraries precede nvidia's via LD_PRELOAD. 451resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL
452 " 452libraries precede nvidia's via LD_PRELOAD.
453EOM
453fi 454fi
454 455
455echo "Running $QEMU..." 456echo "Running $QEMU..."