aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2005-03-05 20:40:27 +0000
committerPhil Blundell <philb@gnu.org>2005-03-05 20:40:27 +0000
commit75829d795e816ec2d8a0efb71a82503b41840e9f (patch)
tree8b3d047fe9e3d431e1e0a11a82fb5623f9f5cce6
parent327ed6c6dc7c206611b24938ecc11fff748ccf3b (diff)
downloadopenembedded-75829d795e816ec2d8a0efb71a82503b41840e9f.tar.gz
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe 2005/03/05 20:40:10+00:00 nexus.co.uk!pb put foo-config files in STAGING_BINDIR/HOST_SYS, since -native versions differ from the regular ones. BKrev: 422a193bs6ZoJh9hr-69NzCS-5DN4g
-rw-r--r--classes/binconfig.bbclass6
-rw-r--r--conf/bitbake.conf2
2 files changed, 4 insertions, 4 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index b2545deddd..866d689896 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -24,8 +24,8 @@ def is_native(d):
do_stage_append() {
for config in `find ${S} -name '*-config'`; do
configname=`basename $config`${@is_native(d)}
- install -d ${STAGING_BINDIR}
- cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname
- chmod u+x ${STAGING_BINDIR}/$configname
+ install -d ${STAGING_BINDIR}/${HOST_SYS}
+ cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/${HOST_SYS}/$configname
+ chmod u+x ${STAGING_BINDIR}/${HOST_SYS}/$configname
done
}
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d7574fc013..76cab50ca7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -191,7 +191,7 @@ EXTRA_IMAGEDEPENDS = ""
CROSS_DIR = "${TMPDIR}/cross"
CROSS_DATADIR = "${CROSS_DIR}/share"
-export PATH_prepend = "${STAGING_BINDIR}:${CROSS_DIR}/bin:"
+export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:"
##################################################################
# Build utility info.