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:35 +0100 |
commit | 160c4fd9aea84f2aba27158c998a3b6340471040 (patch) | |
tree | d20edf38e3c38e732c1d35d22d5941d4b68f40ba | |
parent | a00f8981d8d2b361cc2c5d08d7cc6040c79af3cb (diff) | |
download | poky-160c4fd9aea84f2aba27158c998a3b6340471040.tar.gz |
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.
(From OE-Core rev: 8164c466943ffedff399009bf5547dba4f06d6c8)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() { | |||
239 | oe.utils.features_backfill("DISTRO_FEATURES", e.data) | 239 | oe.utils.features_backfill("DISTRO_FEATURES", e.data) |
240 | oe.utils.features_backfill("MACHINE_FEATURES", e.data) | 240 | oe.utils.features_backfill("MACHINE_FEATURES", e.data) |
241 | # Works with the line in layer.conf which changes PATH to point here | 241 | # Works with the line in layer.conf which changes PATH to point here |
242 | setup_hosttools_dir(d.expand('${TMPDIR}/hosttools'), 'HOSTTOOLS', d) | 242 | setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d) |
243 | setup_hosttools_dir(d.expand('${TMPDIR}/hosttools'), 'HOSTTOOLS_NONFATAL', d, fatal=False) | 243 | setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False) |
244 | 244 | ||
245 | if isinstance(e, bb.event.BuildStarted): | 245 | if isinstance(e, bb.event.BuildStarted): |
246 | localdata = bb.data.createCopy(e.data) | 246 | 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 | |||
452 | # Build utility info. | 452 | # Build utility info. |
453 | ################################################################## | 453 | ################################################################## |
454 | 454 | ||
455 | # Directory where host tools are copied | ||
456 | HOSTTOOLS_DIR = "${TMPDIR}/hosttools" | ||
457 | |||
455 | # Tools needed to run builds with OE-Core | 458 | # Tools needed to run builds with OE-Core |
456 | HOSTTOOLS += " \ | 459 | HOSTTOOLS += " \ |
457 | [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp cp cpio \ | 460 | [ 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 += " \ | |||
60 | " | 60 | " |
61 | 61 | ||
62 | # We need to keep bitbake tools in PATH | 62 | # We need to keep bitbake tools in PATH |
63 | PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${TMPDIR}/hosttools" | 63 | PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" |