aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-10-27 17:27:34 -0700
committerChris Larson <chris_larson@mentor.com>2010-11-04 11:22:17 -0700
commit1f22ae6825bdd652a13b16e3e786d82484ff7037 (patch)
treebfa54b2b377c95633a82aa6e0908e437ff662bf3
parentc35b4a0846ea9867ed1eeea94a465019a22b6b6c (diff)
downloadopenembedded-1f22ae6825bdd652a13b16e3e786d82484ff7037.zip
openembedded-1f22ae6825bdd652a13b16e3e786d82484ff7037.tar.gz
openembedded-1f22ae6825bdd652a13b16e3e786d82484ff7037.tar.bz2
bitbake.conf: include bin dirs from BBPATH in PATH
Signed-off-by: Chris Larson <chris_larson@mentor.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.conf5
-rw-r--r--conf/build/Power Macintosh-darwin.conf2
-rw-r--r--conf/build/i386-darwin.conf2
5 files changed, 5 insertions, 4 deletions
diff --git a/bin/cp b/bin/darwin/cp
index 0a523b7..0a523b7 100755
--- a/bin/cp
+++ b/bin/darwin/cp
diff --git a/bin/sed b/bin/darwin/sed
index 2200bd1..2200bd1 100755
--- a/bin/sed
+++ b/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