From fc0bb31aa73b8105206c58dff66297c8fb1d2b3b Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Thu, 5 Dec 2013 13:57:31 -0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/runqemu | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/runqemu b/scripts/runqemu index 619ffb6bed..9c0a03b4e2 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 -- cgit v1.2.3-54-g00ecf