summaryrefslogtreecommitdiff
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorMihai Prica <mihai.prica@intel.com>2013-09-02 15:50:51 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-04 14:17:23 +0100
commit22c0668d9e0a22c095d78bab7b45ef4f803dd0d1 (patch)
tree78bd66dfdd0d14f72f04420c668b21670052d900 /scripts/runqemu
parent3e660ec01cc62c57b379b151e43c7952e97a1c2b (diff)
downloadopenembedded-core-22c0668d9e0a22c095d78bab7b45ef4f803dd0d1.tar.gz
openembedded-core-22c0668d9e0a22c095d78bab7b45ef4f803dd0d1.tar.bz2
openembedded-core-22c0668d9e0a22c095d78bab7b45ef4f803dd0d1.zip
scripts/runqemu: Fix MACHINE regex
When runqemu tries to determine the MACHINE variable from a kernel or vmdk filename that doesn't contain any known machine name, the variable gets set to the filename. It should remain unset and cause an error. [YOCTO #2890] Signed-off-by: Mihai Prica <mihai.prica@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 04dc3b0571..b49678502a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -224,13 +224,13 @@ fi
if [ -z "$MACHINE" ]; then
if [ "x$FSTYPE" = "xvmdk" ]; then
- MACHINE=`basename $VM | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
+ MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
if [ -z "$MACHINE" ]; then
error "Unable to set MACHINE from vmdk filename [$VM]"
fi
echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
else
- MACHINE=`basename $KERNEL | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
+ MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
if [ -z "$MACHINE" ]; then
error "Unable to set MACHINE from kernel filename [$KERNEL]"
fi