mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu: make warning messages consistent in format

Browse Source 
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>
This commit is contained in:
Darren Hart
2011-03-18 10:28:08 -07:00
committed by Richard Purdie
parent a5d2854104
commit ed8bcb28b2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/poky-qemu-internal
View File

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