diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-04-28 17:01:01 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-01 08:56:24 +0100 |
| commit | 8164c466943ffedff399009bf5547dba4f06d6c8 (patch) | |
| tree | 6292c2936665a7248f9d454d157826106f5d6638 /meta | |
| parent | 4fe59183dae7c556363bc885cfda11a38c0d2d47 (diff) | |
| download | openembedded-core-8164c466943ffedff399009bf5547dba4f06d6c8.tar.gz openembedded-core-8164c466943ffedff399009bf5547dba4f06d6c8.tar.bz2 openembedded-core-8164c466943ffedff399009bf5547dba4f06d6c8.zip | |
bitbake.conf: Add HOSTTOOLS_DIR for ${TMPDIR}/hosttools
The path to where to install and find the tools copied from the host
environment is already used in a couple of places. This warrants it to
get its own variable.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/conf/layer.conf | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e29821f199..d95afb7b9b 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -239,8 +239,8 @@ python base_eventhandler() { oe.utils.features_backfill("DISTRO_FEATURES", e.data) oe.utils.features_backfill("MACHINE_FEATURES", e.data) # Works with the line in layer.conf which changes PATH to point here - setup_hosttools_dir(d.expand('${TMPDIR}/hosttools'), 'HOSTTOOLS', d) - setup_hosttools_dir(d.expand('${TMPDIR}/hosttools'), 'HOSTTOOLS_NONFATAL', d, fatal=False) + setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d) + setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False) if isinstance(e, bb.event.BuildStarted): localdata = bb.data.createCopy(e.data) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bab7016fba..a24be0551d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -452,6 +452,9 @@ export PATH # Build utility info. ################################################################## +# Directory where host tools are copied +HOSTTOOLS_DIR = "${TMPDIR}/hosttools" + # Tools needed to run builds with OE-Core HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp cp cpio \ diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 739d82ea56..fc165021c5 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -60,4 +60,4 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " # We need to keep bitbake tools in PATH -PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${TMPDIR}/hosttools" +PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" |