From: Scott Garman <scott.a.garman@intel.com>
Date: Fri, 17 Aug 2012 17:54:40 +0000 (-0700)
Subject: runqemu: work with yocto-bsp created kernel filenames
X-Git-Tag: yocto-4.0~35856
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17d616adffc3514b6778acc6ab5d6da34a7366b5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

runqemu: work with yocto-bsp created kernel filenames

The yocto-bsp tool generates kernels with additional strings within
the filename, e.g. zImage-myqemuarm.bin. Loosen the MACHINE detection
regex to work with these filenames.

Fixes [YOCTO #2890].

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 7e4bcc4e5f8..90998aeab41 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -229,7 +229,7 @@ if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then
 fi
 
 if [ -z "$MACHINE" ]; then
-    MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
+    MACHINE=`basename $KERNEL | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'`
     if [ -z "$MACHINE" ]; then
         error "Unable to set MACHINE from kernel filename [$KERNEL]"
     fi