aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>2018-01-11 22:55:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-12 08:43:54 +0000
commit03fa13a269d2887cc5d13fd474fb39a2be037f2c (patch)
tree2dad4c5353dd81ca8308d4ecd5d2d605946dbff6
parentdcea30b885797ece3439cf1201795a975628d664 (diff)
downloadopenembedded-core-contrib-03fa13a269d2887cc5d13fd474fb39a2be037f2c.tar.gz
openembedded-core-contrib-03fa13a269d2887cc5d13fd474fb39a2be037f2c.tar.bz2
openembedded-core-contrib-03fa13a269d2887cc5d13fd474fb39a2be037f2c.zip
scripts/wic: explicitly set BUILDDIR within eSDK
When we run wic within eSDK: $ wic create mkefidisk -e core-image-minimal ERROR: BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?) In order to figure out variable values, one must have sourced the OE build environment setup script. However, when we are in within the eSDK environment which isn't initialised like the normal OE build environment, we can't use wic utility with eSDK. Reference: https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#wic-requirements While wic ought to be fixed to be able to run without bitbake & native tools [YOCTO #11281], but this is a workaround to set BUILDDIR in the environment so that bitbake environment is setup for wic to build its required native tools. Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/wic2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/wic b/scripts/wic
index d9bea228ad5..7392bc4e7f4 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -51,6 +51,8 @@ sdkroot = scripts_path
if os.environ.get('SDKTARGETSYSROOT'):
while sdkroot != '' and sdkroot != os.sep:
if os.path.exists(os.path.join(sdkroot, '.devtoolbase')):
+ # Set BUILDDIR for wic to work within eSDK
+ os.environ['BUILDDIR'] = sdkroot
# .devtoolbase only exists within eSDK
# If found, initialize bitbake path for eSDK environment and append to PATH
sdkroot = os.path.join(os.path.dirname(scripts_path), 'bitbake', 'bin')