[oe-commits] Pascal Bach : runqemu: don' t complain about conflicting machines if they are equal

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 721992be06c7615a0abdecc9798bb97622c3e641
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=721992be06c7615a0abdecc9798bb97622c3e641

Author: Pascal Bach <pascal.bach at siemens.com>
Date:   Thu Sep 24 18:10:05 2015 +0200

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 at siemens.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/runqemu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 23cf5be..5989507 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" )