aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-10-27 17:27:34 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-22 19:41:16 +0200
commit76bd6b717e80c6ab6671246cdea1f89c7f8e0a2e (patch)
tree7543d0455bc7d9c89f7bec486b597ac0d6e8a60e
parentb1b71c9452bc77f72cd7d31af928cb0ad2675b84 (diff)
downloadopenembedded-76bd6b717e80c6ab6671246cdea1f89c7f8e0a2e.tar.gz
openembedded-76bd6b717e80c6ab6671246cdea1f89c7f8e0a2e.tar.bz2
openembedded-76bd6b717e80c6ab6671246cdea1f89c7f8e0a2e.zip
bitbake.conf: include bin dirs from BBPATH in PATH
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> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rwxr-xr-xbin/darwin/cp (renamed from bin/cp)0
-rwxr-xr-xbin/darwin/sed (renamed from bin/sed)0
-rw-r--r--conf/bitbake.conf3
-rw-r--r--conf/build/Power Macintosh-darwin.conf2
-rw-r--r--conf/build/i386-darwin.conf2
5 files changed, 4 insertions, 3 deletions
diff --git a/bin/cp b/bin/darwin/cp
index 0a523b7987..0a523b7987 100755
--- a/bin/cp
+++ b/bin/darwin/cp
diff --git a/bin/sed b/bin/darwin/sed
index 352a3ca6e8..352a3ca6e8 100755
--- a/bin/sed
+++ b/bin/darwin/sed
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b39bb7af9d..76d5a7486c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -434,7 +434,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