summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2015-09-24 18:10:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:30 +0100
commitaa1253f23d031da76711004182d379ee71528a05 (patch)
tree533164784c41eb52c54a3e3158d00923cfe125e7 /scripts
parent994915b0afc0421a99ec1b8be59a826cdaab1a16 (diff)
downloadpoky-aa1253f23d031da76711004182d379ee71528a05.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. (From OE-Core rev: 6615a21d578ba9ab053ba0b3deab26ebf88e577b) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu2
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
111 case "$arg" in 111 case "$arg" in
112 "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \ 112 "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \
113 "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq") 113 "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq")
114 [ -z "$MACHINE" ] && MACHINE=$arg || \ 114 [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
115 error "conflicting MACHINE types [$MACHINE] and [$arg]" 115 error "conflicting MACHINE types [$MACHINE] and [$arg]"
116 ;; 116 ;;
117 "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs" | "hddimg" | "hdddirect" ) 117 "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs" | "hddimg" | "hdddirect" )