[oe] [PATCH 1/4] bitbake.conf: include bin dirs from BBPATH in PATH

[Chris Larson]

From: Chris Larson <chris_larson at mentor.com>

Signed-off-by: Chris Larson <chris_larson at mentor.com>
---
 bin/{ => darwin}/cp                    |    0
 bin/{ => darwin}/sed                   |    0
 conf/bitbake.conf                      |    5 +++--
 conf/build/Power Macintosh-darwin.conf |    2 +-
 conf/build/i386-darwin.conf            |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename bin/{ => darwin}/cp (100%)
 rename bin/{ => darwin}/sed (100%)

diff --git a/bin/cp b/bin/darwin/cp
similarity index 100%
rename from bin/cp
rename to bin/darwin/cp
diff --git a/bin/sed b/bin/darwin/sed
similarity index 100%
rename from bin/sed
rename to bin/darwin/sed
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f1dc0ff..d03d7e3 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -421,8 +421,9 @@ EXTRA_IMAGEDEPENDS = ""
 
 LIBTOOL_HAS_SYSROOT ?= "no"
 
-PATH_prepend = "${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
+BBPATH_BIN = "${@':'.join('%s/bin' % path for path in '${BBPATH}'.split(':'))}"
+PATH =. "${BBPATH_BIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
+PATH[export] = "1"
 
 ##################################################################
 # Build utility info.
diff --git a/conf/build/Power Macintosh-darwin.conf b/conf/build/Power Macintosh-darwin.conf
index effddbf..b42051b 100644
--- a/conf/build/Power Macintosh-darwin.conf	
+++ b/conf/build/Power Macintosh-darwin.conf	
@@ -1,4 +1,4 @@
-PATH =. "${@bb.which('${BBPATH}', 'bin')}:"
+PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:"
 BUILD_ARCH = "powerpc"
 
 require conf/build/darwin/utilities.inc
diff --git a/conf/build/i386-darwin.conf b/conf/build/i386-darwin.conf
index c9e81b9..bdcb075 100644
--- a/conf/build/i386-darwin.conf
+++ b/conf/build/i386-darwin.conf
@@ -1,4 +1,4 @@
-PATH =. "${@bb.which('${BBPATH}', 'bin')}:"
+PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:"
 BUILD_CC_ARCH += "-m32"
 
 require conf/build/darwin/utilities.inc
-- 
1.7.2.3