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 <scott.a.garman@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
cb9136dd8e
commit
fc0bb31aa7
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue