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/classes/image.bbclass | 2 +- meta/classes/image_types.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4d50601bb2..e20e447680 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -337,7 +337,7 @@ python do_rootfs_wicenv () { return stdir = d.getVar('STAGING_DIR') - outdir = os.path.join(stdir, 'imgdata') + outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata') bb.utils.mkdirhier(outdir) basename = d.getVar('IMAGE_BASENAME') with open(os.path.join(outdir, basename) + '.env', 'w') as envf: diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 005d1e2d4e..0e5f38a8b9 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -216,7 +216,7 @@ IMAGE_CMD_wic () { bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." fi - BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" rm -rf "$out/" } -- cgit v1.2.3