summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-11-03 17:37:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:07 +0000
commit3d7d510701db50e6e6ee550561e001e715f6818c (patch)
tree27524e9058ede681610f474ca150f3d95d17935c /scripts
parent20291f3d081ac83b5b2700df4d8ec2d85e77c5aa (diff)
downloadpoky-3d7d510701db50e6e6ee550561e001e715f6818c.tar.gz
runqemu: look for *-image* to be more flexible for image names
We can't just look for *image* since it will catch up bzimage (From OE-Core rev: c2f88c658b73da67d93312591b3e67b42f629fe3) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 31e9822693..4adeacece1 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -114,7 +114,7 @@ while [ $i -le $# ]; do
114 usage 114 usage
115 fi 115 fi
116 ;; 116 ;;
117 *-image-*) 117 *-image*)
118 if [ -z "$ROOTFS" ]; then 118 if [ -z "$ROOTFS" ]; then
119 if [ -f "$arg" ]; then 119 if [ -f "$arg" ]; then
120 process_filename $arg 120 process_filename $arg
@@ -307,7 +307,7 @@ findimage() {
307 307
308 # Sort rootfs candidates by modification time - the most 308 # Sort rootfs candidates by modification time - the most
309 # recently created one is the one we most likely want to boot. 309 # recently created one is the one we most likely want to boot.
310 filenames=`ls -t $where/*core-image*$machine.$extension 2>/dev/null | xargs` 310 filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
311 for name in $filenames; do 311 for name in $filenames; do
312 if [[ "$name" =~ core-image-sato-sdk || 312 if [[ "$name" =~ core-image-sato-sdk ||
313 "$name" =~ core-image-sato || 313 "$name" =~ core-image-sato ||