[oe-commits] Scott Garman : runqemu: remove core-image-* whitelist

[git at git.openembedded.org]

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

Author: Scott Garman <scott.a.garman at intel.com>
Date:   Thu Dec  5 13:57:31 2013 -0800

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].

Signed-off-by: Scott Garman <scott.a.garman at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 scripts/runqemu | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 619ffb6..9c0a03b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -399,18 +399,11 @@ findimage() {
 
     # Sort rootfs candidates by modification time - the most
     # recently created one is the one we most likely want to boot.
-    filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
-    for name in $filenames; do
-        case $name in
-        *core-image-sato* | \
-        *core-image-lsb* | \
-        *core-image-basic* | \
-        *core-image-minimal* )
-            ROOTFS=$name
-            return
-            ;;
-        esac
-    done
+    filename=`ls -t1 $where/*-image*$machine.$extension 2>/dev/null | head -n1`
+    if [ "x$filename" != "x" ]; then
+        ROOTFS=$filename
+        return
+    fi
 
     echo "Couldn't find a $machine rootfs image in $where."
     exit 1