[oe-commits] Scott Garman : runqemu: work with yocto-bsp created kernel filenames

[git at git.openembedded.org]

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

Author: Scott Garman <scott.a.garman at intel.com>
Date:   Fri Aug 17 10:54:40 2012 -0700

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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 7e4bcc4..90998ae 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