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 13:48:54 +0100 |
| commit | 47b569553f1211e04ee21ebdece2ee3a509a83be (patch) | |
| tree | 909afe6282d2cc3f5d199292f88b69cff6633d1a /meta/recipes-core/meta/wic-tools.bb | |
| parent | ad02f253f08a3da3fa5c86ae4f6ba7f94b070578 (diff) | |
| download | openembedded-core-contrib-47b569553f1211e04ee21ebdece2ee3a509a83be.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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/meta/wic-tools.bb')
| -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" DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" INHIBIT_DEFAULT_DEPS = "1" + inherit nopackages # 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}" python do_build_sysroot () { bb.build.exec_func("extend_recipe_sysroot", d) - - # Write environment variables used by wic - # to tmp/sysroots/<machine>/imgdata/wictools.env - outdir = os.path.join(d.getVar('STAGING_DIR'), d.getVar('MACHINE'), 'imgdata') - bb.utils.mkdirhier(outdir) - with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf: - for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'): - envf.write('%s="%s"\n' % (var, d.getVar(var).strip())) - } addtask do_build_sysroot after do_prepare_recipe_sysroot before do_build |