layer.conf/bitbake.conf: Tweak PATH

We want the help2man script in scripts/ to be found in preference to any from
the host system and from the native sysroot. It turns out to be tricky to
get the order right from layer.conf so we move the addition of the scripts
directory to bitbake.conf.

Without this, "bitbake libtasn1 -c cleansstate; bitbake help2man-native; bitbake libtasn1"
will fail due to finding the host system help2man before ours.

(From OE-Core rev: 859255dd30958db018d40ede94a76db36a98da7f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-05-30 17:04:21 +01:00
parent 534f31903b
commit 8c2e3c9679
2 changed files with 1 additions and 5 deletions

View File

@ -402,7 +402,7 @@ EXTRA_IMAGEDEPENDS = ""
# Toolchain info.
##################################################################
PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
PATH_prepend = "${COREBASE}/scripts:${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
export PATH
##################################################################

View File

@ -11,11 +11,7 @@ BBFILE_PRIORITY_normal = "5"
# Set a variable to get to the top of the metadata location
COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
# Add scripts to PATH
PATH := "${PATH}:${COREBASE}/scripts"
# Set path to qemu image tests included in this layer
QEMUIMAGETESTS := "${COREBASE}/scripts/qemuimage-tests"
SIGGEN_EXCLUDERECIPES_ABISAFE += " \