Patchwork [1/1] runqemu: work with yocto-bsp created kernel filenames

login
register
mail settings
Submitter Scott Garman
Date Aug. 17, 2012, 5:54 p.m.
Message ID <65322d27a0aacb4ae25b9cac6fef0e173a900f09.1345225925.git.scott.a.garman@intel.com>
Download mbox | patch
Permalink /patch/34863/
State Accepted
Commit 17d616adffc3514b6778acc6ab5d6da34a7366b5
Headers show

Comments

Scott Garman - Aug. 17, 2012, 5:54 p.m.
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>
---
 scripts/runqemu |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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