From 859255dd30958db018d40ede94a76db36a98da7f Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 30 May 2012 17:04:21 +0100
Subject: 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>
---
 meta/conf/bitbake.conf | 2 +-
 meta/conf/layer.conf   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'meta')

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 += " \
-- 
cgit v1.2.3