diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-11-22 02:13:00 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-19 22:47:20 +0000 |
commit | 28ef841440bbd27fcf89b1f73a8c5f8e5591d30a (patch) | |
tree | 2c5aecc91d02916a5639f3a2837d317579671b82 | |
parent | 5c2c17d076a8d5f94dc04e6840c7f0e4a6bee81c (diff) | |
download | poky-28ef841440bbd27fcf89b1f73a8c5f8e5591d30a.tar.gz |
qemuboot.bbclass: use IMGDEPLOYDIR
So that "bitbake <image> -ccleansstate" can remove qemuboot.conf
(From OE-Core rev: 0704f15d1ad7483f80ffa18fa32b6115923641cf)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/qemuboot.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 28e8a737f8..a181fa2213 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass | |||
@@ -43,6 +43,7 @@ QB_OPT_APPEND ?= "-show-cursor" | |||
43 | 43 | ||
44 | # Create qemuboot.conf | 44 | # Create qemuboot.conf |
45 | addtask do_write_qemuboot_conf after do_rootfs before do_image | 45 | addtask do_write_qemuboot_conf after do_rootfs before do_image |
46 | IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete" | ||
46 | 47 | ||
47 | def qemuboot_vars(d): | 48 | def qemuboot_vars(d): |
48 | build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', | 49 | build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', |
@@ -55,8 +56,8 @@ do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" | |||
55 | python do_write_qemuboot_conf() { | 56 | python do_write_qemuboot_conf() { |
56 | import configparser | 57 | import configparser |
57 | 58 | ||
58 | qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_NAME')) | 59 | qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME')) |
59 | qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('DEPLOY_DIR_IMAGE'), d.getVar('IMAGE_LINK_NAME')) | 60 | qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME')) |
60 | cf = configparser.ConfigParser() | 61 | cf = configparser.ConfigParser() |
61 | cf.add_section('config_bsp') | 62 | cf.add_section('config_bsp') |
62 | for k in qemuboot_vars(d): | 63 | for k in qemuboot_vars(d): |