runqemu: don't set KERNEL for wic images
Wic images should be boot as is, without pointing qemu to the kernel binary. Current code doesn't use kernel, but sets KERNEL variable and shows kernel path in the console output. This can confuse users. Changed runqemu and runqemu-internal code to avoid setting KERNEL variable and show kernel path. (From OE-Core rev: 474caa7ed5ff05caa5d49d270b283882fa616ed1) (From OE-Core rev: 35e776e00cce25f2c9c45500612fb66022ec4739) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2c3a009b20
commit
c7f0578b78
|
@ -454,7 +454,7 @@ if [ -e "$ROOTFS" -a -z "$FSTYPE" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then
|
||||
if [ -z "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" -a "x$FSTYPE" != "xwic" ]; then
|
||||
setup_path_vars 1
|
||||
eval kernel_file=\$${machine2}_DEFAULT_KERNEL
|
||||
KERNEL=$DEPLOY_DIR_IMAGE/$kernel_file
|
||||
|
|
|
@ -301,7 +301,7 @@ case "$MACHINE" in
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ ! -f "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then
|
||||
if [ ! -f "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" -a "x$FSTYPE" != "xwic" ]; then
|
||||
echo "Error: Kernel image file $KERNEL doesn't exist"
|
||||
cleanup
|
||||
return 1
|
||||
|
|
Loading…
Reference in New Issue