diff options
| -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 |
