aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2013-12-05 13:57:31 -0800
committerRobert Yang <liezhi.yang@windriver.com>2014-01-26 14:08:17 +0800
commit48f4b36c1a6ad71da752866b8c28885d95444b4e (patch)
tree5487a5993c1824174a5e34895f36728afe0ae079 /scripts
parentf9b4ca8304a657f167cc78055631e9b0b996a28e (diff)
downloadopenembedded-core-contrib-48f4b36c1a6ad71da752866b8c28885d95444b4e.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 master 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'scripts')
-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