summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 17:04:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 17:23:48 +0100
commit859255dd30958db018d40ede94a76db36a98da7f (patch)
tree6171075d60cc8358695c80232da9dfcb9b8735ae /meta
parentf5356062443320c29a19cfd7113128caa185b221 (diff)
downloadopenembedded-core-859255dd30958db018d40ede94a76db36a98da7f.tar.gz
openembedded-core-859255dd30958db018d40ede94a76db36a98da7f.tar.bz2
openembedded-core-859255dd30958db018d40ede94a76db36a98da7f.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/layer.conf4
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 48287a71ab..70a49c60e2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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
##################################################################
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 76ae58ceb7..43e42957c5 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -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 += " \