From 94245144f5cef344d90bc2a7b3267cdae9d192e4 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 25 Jan 2017 19:39:14 +0200 Subject: wic: change location of .env files Current location of .env files $STAGING_DIR/imagedata. It doesn't depend on machine and be rewritten by the builds for different machines. Changed location to $STAGING_DIR/$MACHINE/imagedata to avoid .env files to be rewritten. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- meta/recipes-core/meta/wic-tools.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/meta') diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index 0a53b7319e..aa09c82e76 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb @@ -14,7 +14,7 @@ python do_build_sysroot () { # Write environment variables used by wic # to tmp/sysroots//imgdata/wictools.env - outdir = os.path.join(d.getVar('STAGING_DIR'), 'imgdata') + 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'): -- cgit 1.2.3-korg