From: Scott Garman Date: Thu, 5 Dec 2013 21:57:31 +0000 (-0800) Subject: runqemu: remove core-image-* whitelist X-Git-Tag: rev_ivi_2015_02_04~10057 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bebe333f4e653fd6c4ef2ae62752162012a4ab00;p=scm%2Fbb%2Ftizen-distro.git 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 --- 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