From c1c058fc29f916c2f000bb7195f6195e271873b0 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Wed, 27 Oct 2010 17:27:34 -0700
Subject: [PATCH] bitbake.conf: include bin dirs from BBPATH in PATH
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Eric Bénard <eric@eukrea.com>
---
 bin/{ => darwin}/cp                    | 0
 bin/{ => darwin}/sed                   | 0
 conf/bitbake.conf                      | 3 ++-
 conf/build/Power Macintosh-darwin.conf | 2 +-
 conf/build/i386-darwin.conf            | 2 +-
 5 files changed, 4 insertions(+), 3 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 ad2e721c77..1baecc10cf 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -448,7 +448,8 @@ EXTRA_IMAGEDEPENDS = ""
 LIBTOOL_HAS_SYSROOT ?= "no"
 LIBTOOL_HAS_SYSROOT[type] = "boolean"
 
-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}:"
+BBPATH_BIN = "${@':'.join('%s/bin' % path for path in '${BBPATH}'.split(':'))}"
+PATH_prepend = "${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[type] = "list"
 PATH[separator] = ":"
 export PATH
diff --git a/conf/build/Power Macintosh-darwin.conf b/conf/build/Power Macintosh-darwin.conf
index effddbf1c9..b42051b081 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 c9e81b9c5d..bdcb075ea7 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
-- 
2.39.5