[oe-commits] Chris Larson : bitbake.conf: include bin dirs from BBPATH in PATH

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: d14922c812636aa631cc04499590d62b65ef8bb0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d14922c812636aa631cc04499590d62b65ef8bb0

Author: Chris Larson <chris_larson at mentor.com>
Date:   Wed Oct 27 17:27:34 2010 -0700

bitbake.conf: include bin dirs from BBPATH in PATH

Signed-off-by: Chris Larson <chris_larson at mentor.com>
Acked-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Eric Bénard <eric at 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(-)

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 ad2e721..1baecc1 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 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