diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-14 15:33:04 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:37 +0100 |
commit | a57a9614e6077213d496ea4c445359bd9a5b3b5e (patch) | |
tree | 8048306cf0c0c6c1ab3aa47858d4336d3760e242 | |
parent | f58ea8c81412344cae268960d13b968901f19577 (diff) | |
download | poky-a57a9614e6077213d496ea4c445359bd9a5b3b5e.tar.gz |
wic-tools: don't create wic-tools.env
wic-tools.env was uses only when wic is run from bitbake.
As wic doesn't use wic-tools anymore in this mode there is
no need for this file.
(From OE-Core rev: 47b569553f1211e04ee21ebdece2ee3a509a83be)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index cd494ec233..c416a2eab1 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb | |||
@@ -11,6 +11,7 @@ DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" | |||
11 | DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" | 11 | DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" |
12 | 12 | ||
13 | INHIBIT_DEFAULT_DEPS = "1" | 13 | INHIBIT_DEFAULT_DEPS = "1" |
14 | |||
14 | inherit nopackages | 15 | inherit nopackages |
15 | 16 | ||
16 | # The sysroot of wic-tools is needed for wic, but if rm_work is enabled, it will | 17 | # The sysroot of wic-tools is needed for wic, but if rm_work is enabled, it will |
@@ -19,14 +20,5 @@ RM_WORK_EXCLUDE += "${PN}" | |||
19 | 20 | ||
20 | python do_build_sysroot () { | 21 | python do_build_sysroot () { |
21 | bb.build.exec_func("extend_recipe_sysroot", d) | 22 | bb.build.exec_func("extend_recipe_sysroot", d) |
22 | |||
23 | # Write environment variables used by wic | ||
24 | # to tmp/sysroots/<machine>/imgdata/wictools.env | ||
25 | outdir = os.path.join(d.getVar('STAGING_DIR'), d.getVar('MACHINE'), 'imgdata') | ||
26 | bb.utils.mkdirhier(outdir) | ||
27 | with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf: | ||
28 | for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'): | ||
29 | envf.write('%s="%s"\n' % (var, d.getVar(var).strip())) | ||
30 | |||
31 | } | 23 | } |
32 | addtask do_build_sysroot after do_prepare_recipe_sysroot before do_build | 24 | addtask do_build_sysroot after do_prepare_recipe_sysroot before do_build |