diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-03-18 10:28:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-18 23:23:33 +0000 |
commit | c0298557bad2e431f6dc87b6fda061cab561e14c (patch) | |
tree | 3053e3693b15b02b797146face48c3f6b30c1754 /scripts | |
parent | dd2f9f69d97423bc4a97f9e14457dc136dee1fe4 (diff) | |
download | poky-c0298557bad2e431f6dc87b6fda061cab561e14c.tar.gz |
qemu: make warning messages consistent in format
Try to make the output of the qemu script a bit more consistent by using the
same format for the various warning messages:
WARNING: description of warning.
Detailed description of warning, actions taken, and/or instructions to user.
(From OE-Core rev: 7895377378c197289b82e3bbc059454770911abd)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/poky-qemu-internal | 17 |
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 & |
441 | else | 441 | else |
442 | echo "Warning: distccd not present, no distcc support loaded." | 442 | echo "WARNING: distccd not present, no distcc support loaded." |
443 | fi | 443 | fi |
444 | 444 | ||
445 | # qemu got segfault if linked with nVidia's libgl | 445 | # qemu got segfault if linked with nVidia's libgl |
446 | if ldd $QEMUBIN | grep -i nvidia &> /dev/null | 446 | if ldd $QEMUBIN | grep -i nvidia &> /dev/null |
447 | then | 447 | then |
448 | echo "************** !!!Warning!!! ************** | 448 | cat << EOM |
449 | nVidia's proprietary OpenGL libraries are known to have compatibility | 449 | WARNING: nVidia proprietary OpenGL libraries detected. |
450 | issues with qemu, resulting in a segfault. Please uninstall these | 450 | nVidia'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. | 451 | resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL |
452 | " | 452 | libraries precede nvidia's via LD_PRELOAD. |
453 | EOM | ||
453 | fi | 454 | fi |
454 | 455 | ||
455 | echo "Running $QEMU..." | 456 | echo "Running $QEMU..." |