mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: change location of .env files

Browse Source 
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.

(From OE-Core rev: 94245144f5cef344d90bc2a7b3267cdae9d192e4)

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>
This commit is contained in:
Ed Bartosh
2017-01-25 19:39:14 +02:00
committed by Richard Purdie
parent 3d585a518c
commit c01cc6ff24
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/image.bbclass
View File

@@ -337,7 +337,7 @@ python do_rootfs_wicenv () {
return return
stdir = d.getVar('STAGING_DIR') stdir = d.getVar('STAGING_DIR')
outdir = os.path.join(stdir, 'imgdata') outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata')
bb.utils.mkdirhier(outdir) bb.utils.mkdirhier(outdir)
basename = d.getVar('IMAGE_BASENAME') basename = d.getVar('IMAGE_BASENAME')
with open(os.path.join(outdir, basename) + '.env', 'w') as envf: with open(os.path.join(outdir, basename) + '.env', 'w') as envf:

2
meta/classes/image_types.bbclass
View File

@@ -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." bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
fi 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" mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
rm -rf "$out/" rm -rf "$out/"
} }

3
meta/lib/oeqa/selftest/wic.py
View File

@@ -347,7 +347,8 @@ class Wic(oeSelfTest):
if image not in self.wicenv_cache: if image not in self.wicenv_cache:
self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
stdir = get_bb_var('STAGING_DIR', image) stdir = get_bb_var('STAGING_DIR', image)
self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') machine = get_bb_var('MACHINE', image)
self.wicenv_cache[image] = os.path.join(stdir, machine, 'imgdata')
return self.wicenv_cache[image] return self.wicenv_cache[image]
@testcase(1347) @testcase(1347)

2
meta/recipes-core/meta/wic-tools.bb
View File

@@ -14,7 +14,7 @@ python do_build_sysroot () {
# Write environment variables used by wic # Write environment variables used by wic
# to tmp/sysroots/<machine>/imgdata/wictools.env # to tmp/sysroots/<machine>/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) bb.utils.mkdirhier(outdir)
with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf: with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf:
for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'): for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'):