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>
This commit is contained in:
parent
a00f8981d8
commit
160c4fd9ae
|
@ -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)
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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}"
|
||||
|
|
Loading…
Reference in New Issue