Skip to contentSkip to conversation

Fix MACHINE regex in runqemu

PATCH New Mihai Prica 1 participant 2 messages Sep 2, 2013

lore
Share & tools
lore
#0 lore raw

cover Fix MACHINE regex in runqemu

The MACHINE variable wasn't correcty detected from a kernel filename.

The following changes since commit c7994f83baa678a4670472e1f037bfc16cb1e3be:

bitbake: runqueue: Fix scenequeue to pass file descriptors, not a float (2013-09-02 09:16:24 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib mihaip/b2890
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihaip/b2890

Mihai Prica (1):
scripts/runqemu: Fix MACHINE regex

 scripts/runqemu |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 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]

---
 scripts/runqemu |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/runqemu +2 -2
index 04dc3b0..b496785 100755
@@ -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
Signature · 1 line
1.7.9.5