diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-16 22:53:46 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:03:51 +0000 |
| commit | 3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c (patch) | |
| tree | 7541a624ec2cd37a8d66f614ecfaf340e02a6396 /meta/classes | |
| parent | 3443ff47374c7e20ea54e838609b991f3f72810e (diff) | |
| download | openembedded-core-contrib-3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c.tar.gz | |
image.bbclass: put .env files to ${STAGING_DIR}/imgdata/
As STAGING_DIR_TARGET started to point to a recipe specific
sysroot wic is not able to add .env files when .wks file refers
to multiple rootfs recipes.
Used STAGING_DIR instead of STAGING_DIR_TARGET to make the
directory with .env files the same for all recipes.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 5fc7385d79..fb0cce35c5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -342,7 +342,7 @@ python do_rootfs_wicenv () { if not wicvars: return - stdir = d.getVar('STAGING_DIR_TARGET') + stdir = d.getVar('STAGING_DIR') outdir = os.path.join(stdir, 'imgdata') bb.utils.mkdirhier(outdir) basename = d.getVar('IMAGE_BASENAME') diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index bac7ff5d37..5b1746a68c 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_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" rm -rf "$out/" } |