diff options
| author |   Pascal Bach <pascal.bach@siemens.com> | 2015-09-24 18:10:05 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:58:32 +0100 |
| commit | 6615a21d578ba9ab053ba0b3deab26ebf88e577b (patch) | |
| tree | 63a6ca32db78c1efcd190d94d4a47f59ea040e0a /scripts/runqemu | |
| parent | 94057ccc70aa3fe29d774f571a65f56fd1285d4c (diff) | |
| download | openembedded-core-6615a21d578ba9ab053ba0b3deab26ebf88e577b.tar.gz | |
runqemu: don't complain about conflicting machines if they are equal
When the MACHINE variable was set as an environment variable, via
"export MACHINE=qemuarm" and runqemu was executed as "runqemu qemuarm"
The confusing error message appears:
Error: conflicting MACHINE types [qemuarm] and [qemuarm]
This checks if the two values are equal, in that case there is no problem
and execution can continue.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/runqemu')
| -rwxr-xr-x | scripts/runqemu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 23cf5be169..5989507a21 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -111,7 +111,7 @@ while true; do case "$arg" in "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \ "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq") - [ -z "$MACHINE" ] && MACHINE=$arg || \ + [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \ error "conflicting MACHINE types [$MACHINE] and [$arg]" ;; "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs" | "hddimg" | "hdddirect" ) |