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 | ast2050-yocto-poky-c0298557bad2e431f6dc87b6fda061cab561e14c.zip ast2050-yocto-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 0f0f799..82ef265 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -75,7 +75,7 @@ if [ "$MACHINE" = "qemuarm" ]; then RAM=`echo $QEMU_MEMORY | sed 's/M$//'` if [[ -z "$RAM" || $RAM -gt 128 ]]; then echo "WARNING: qemuarm does not support > 128M of RAM." - echo "*** Changing QEMU_MEMORY to default of 128M ***" + echo "Changing QEMU_MEMORY to default of 128M." QEMU_MEMORY="128M" SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 128/" ` fi @@ -102,7 +102,7 @@ acquire_lock() { # Check that the lockfile is not stale ps=`ps -ewwo pid | grep $(cat $lockfile.lock)` if [ -z "$ps" ]; then - echo "Warning: Stale lock file detected, deleting $lockfile.lock" + echo "WARNING: Stale lock file detected, deleting $lockfile.lock." rm -f $lockfile.lock echo $$ > $lockfile.lock else @@ -439,17 +439,18 @@ if [ -x "$DISTCCD" ]; then PIDFILE=`mktemp` $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE & else - echo "Warning: distccd not present, no distcc support loaded." + echo "WARNING: distccd not present, no distcc support loaded." fi # qemu got segfault if linked with nVidia's libgl if ldd $QEMUBIN | grep -i nvidia &> /dev/null then - echo "************** !!!Warning!!! ************** - nVidia's proprietary OpenGL libraries are known to have compatibility - issues with qemu, resulting in a segfault. Please uninstall these - drivers or ensure the mesa libGL libraries precede nvidia's via LD_PRELOAD. - " +cat << EOM +WARNING: nVidia proprietary OpenGL libraries detected. +nVidia's OpenGL libraries are known to have compatibility issues with qemu, +resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL +libraries precede nvidia's via LD_PRELOAD. +EOM fi echo "Running $QEMU..." |
