diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-04-11 02:21:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-12 15:09:57 +0100 |
commit | f57393b386499c607e01ce1b3f1503b2cdca73d9 (patch) | |
tree | 0e30e8a57c7dbc941551e27411bf46343cb62f92 /meta/classes/qemuboot.bbclass | |
parent | f2c09f786704568c0c40726cdc3fef760e941d92 (diff) | |
download | poky-f57393b386499c607e01ce1b3f1503b2cdca73d9.tar.gz |
runqemu: do not rely on grepping images
Fixed when the image is large and not enough memory:
grep: memory exhausted
Aborted
[YOCTO #11073]
(From OE-Core rev: a99deb30a0138594147ae28aab016fe4b74b8959)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qemuboot.bbclass')
-rw-r--r-- | meta/classes/qemuboot.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 3ca97cad4c..2870388dfb 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass | |||
@@ -64,6 +64,9 @@ QB_DEFAULT_FSTYPE ?= "ext4" | |||
64 | QB_OPT_APPEND ?= "-show-cursor" | 64 | QB_OPT_APPEND ?= "-show-cursor" |
65 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" | 65 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" |
66 | 66 | ||
67 | # This should be kept align with ROOT_VM | ||
68 | QB_DRIVE_TYPE ?= "/dev/sd" | ||
69 | |||
67 | # Create qemuboot.conf | 70 | # Create qemuboot.conf |
68 | addtask do_write_qemuboot_conf after do_rootfs before do_image | 71 | addtask do_write_qemuboot_conf after do_rootfs before do_image |
69 | IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete" | 72 | IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete" |