diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-02-13 11:02:09 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-15 16:28:22 +0000 |
| commit | 35e776e00cce25f2c9c45500612fb66022ec4739 (patch) | |
| tree | e9adbebb1644edfd294a1d6d1a622a52513034a4 /scripts | |
| parent | dd42931bf99b8bbd4ad452b3941d957f41b81796 (diff) | |
| download | openembedded-core-35e776e00cce25f2c9c45500612fb66022ec4739.tar.gz openembedded-core-35e776e00cce25f2c9c45500612fb66022ec4739.tar.bz2 openembedded-core-35e776e00cce25f2c9c45500612fb66022ec4739.zip | |
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)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/runqemu | 2 | ||||
| -rwxr-xr-x | scripts/runqemu-internal | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 4bb3bb61ec..083090165b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -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 diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 2926024e3f..ad854d108d 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -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 |