diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-08-17 10:54:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:59 +0100 |
commit | 641f582f53f71ec8e7ed28369b6d253e360f2d69 (patch) | |
tree | c35843eee9d0421e66205385ee75670ede6afe9e | |
parent | d2737ebd7f9882eb237aff42e24490686d77c68f (diff) | |
download | poky-641f582f53f71ec8e7ed28369b6d253e360f2d69.tar.gz |
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].
(From OE-Core rev: 17d616adffc3514b6778acc6ab5d6da34a7366b5)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/runqemu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 7e4bcc4e5f..90998aeab4 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -229,7 +229,7 @@ if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then | |||
229 | fi | 229 | fi |
230 | 230 | ||
231 | if [ -z "$MACHINE" ]; then | 231 | if [ -z "$MACHINE" ]; then |
232 | MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'` | 232 | MACHINE=`basename $KERNEL | sed 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'` |
233 | if [ -z "$MACHINE" ]; then | 233 | if [ -z "$MACHINE" ]; then |
234 | error "Unable to set MACHINE from kernel filename [$KERNEL]" | 234 | error "Unable to set MACHINE from kernel filename [$KERNEL]" |
235 | fi | 235 | fi |