summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2013-12-05 13:57:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-09 18:01:46 +0000
commitfc0bb31aa73b8105206c58dff66297c8fb1d2b3b (patch)
tree602e6d79e2d6a88ff8beaa48ea1d01f71cfa5074
parentcb9136dd8e1f14bd161c3f8bde46cf23bf947518 (diff)
downloadpoky-fc0bb31aa73b8105206c58dff66297c8fb1d2b3b.tar.gz
runqemu: remove core-image-* whitelist
Using a whitelist for image names to default to when none are specified on the command line is no longer desired. Instead, choose the most recently created image filename that conforms to typical image naming conventions. Fixes [YOCTO #5617]. (From OE-Core rev: 9f69e00200cdbd5ba2e46a54f33c29797816e43f) 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-xscripts/runqemu17
1 files changed, 5 insertions, 12 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 619ffb6bed..9c0a03b4e2 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -399,18 +399,11 @@ findimage() {
399 399
400 # Sort rootfs candidates by modification time - the most 400 # Sort rootfs candidates by modification time - the most
401 # recently created one is the one we most likely want to boot. 401 # recently created one is the one we most likely want to boot.
402 filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs` 402 filename=`ls -t1 $where/*-image*$machine.$extension 2>/dev/null | head -n1`
403 for name in $filenames; do 403 if [ "x$filename" != "x" ]; then
404 case $name in 404 ROOTFS=$filename
405 *core-image-sato* | \ 405 return
406 *core-image-lsb* | \ 406 fi
407 *core-image-basic* | \
408 *core-image-minimal* )
409 ROOTFS=$name
410 return
411 ;;
412 esac
413 done
414 407
415 echo "Couldn't find a $machine rootfs image in $where." 408 echo "Couldn't find a $machine rootfs image in $where."
416 exit 1 409 exit 1