poky-qemu: fix handling of some rootfs types
This allows the user to specify a rootfs type (e.g, poky-image-sato) without typing out the full filename and path (assuming we can infer a valid MACHINE and FSTYPE). This fixes [BUGID #415] Signed-off-by: Scott Garman <scott.a.garman@intel.com>
This commit is contained in:
parent
e72e7b2fdc
commit
7cd824a538
|
@ -44,6 +44,7 @@ MACHINE=${MACHINE:=""}
|
||||||
KERNEL=""
|
KERNEL=""
|
||||||
FSTYPE=""
|
FSTYPE=""
|
||||||
ROOTFS=""
|
ROOTFS=""
|
||||||
|
LAZY_ROOTFS=""
|
||||||
SCRIPT_QEMU_OPT=""
|
SCRIPT_QEMU_OPT=""
|
||||||
SCRIPT_KERNEL_OPT=""
|
SCRIPT_KERNEL_OPT=""
|
||||||
|
|
||||||
|
@ -74,6 +75,7 @@ while [ $i -le $# ]; do
|
||||||
*-image-*)
|
*-image-*)
|
||||||
if [ -z "$ROOTFS" ]; then
|
if [ -z "$ROOTFS" ]; then
|
||||||
ROOTFS=$arg
|
ROOTFS=$arg
|
||||||
|
LAZY_ROOTFS="true"
|
||||||
else
|
else
|
||||||
echo "Error: conflicting ROOTFS args [$ROOTFS] and [$arg]"
|
echo "Error: conflicting ROOTFS args [$ROOTFS] and [$arg]"
|
||||||
usage
|
usage
|
||||||
|
@ -260,6 +262,14 @@ if [ -z "$FSTYPE" ]; then
|
||||||
fi
|
fi
|
||||||
# FSTYPE is now set for all cases
|
# FSTYPE is now set for all cases
|
||||||
|
|
||||||
|
# Handle cases where a ROOTFS type is given instead of a filename, e.g.
|
||||||
|
# poky-image-sato
|
||||||
|
if [ "$LAZY_ROOTFS" = "true" ]; then
|
||||||
|
setup_tmpdir
|
||||||
|
echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE"
|
||||||
|
ROOTFS=$TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$ROOTFS" ]; then
|
if [ -z "$ROOTFS" ]; then
|
||||||
setup_tmpdir
|
setup_tmpdir
|
||||||
T=$TMPDIR/deploy/images
|
T=$TMPDIR/deploy/images
|
||||||
|
|
Loading…
Reference in New Issue