summaryrefslogtreecommitdiff
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:39 +0000
commit9f69e00200cdbd5ba2e46a54f33c29797816e43f (patch)
tree5a969e49cc3b884072199511fb3c52cc4ed894e6
parent5050b4a023d8eff3198346bd6e631e87487deb94 (diff)
downloadopenembedded-core-9f69e00200cdbd5ba2e46a54f33c29797816e43f.tar.gz
openembedded-core-9f69e00200cdbd5ba2e46a54f33c29797816e43f.tar.bz2
openembedded-core-9f69e00200cdbd5ba2e46a54f33c29797816e43f.zip
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@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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() {
# 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