[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6745/8267] wic-tools: don't create wic-tools.env
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 6745/8267] wic-tools: don't create wic-tools.env
- Date: Sun, 17 Dec 2017 05:16:34 +0000 (UTC)
commit a57a9614e6077213d496ea4c445359bd9a5b3b5e
Author: Ed Bartosh <ed bartosh linux intel com>
Date: Fri Jul 14 15:33:04 2017 +0300
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>
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 cd494ec..c416a2e 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]