diff options
author | Richard Purdie <richard@openedhand.com> | 2007-01-30 14:44:18 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-01-30 14:44:18 +0000 |
commit | 44856a298c538382c0bb6fadad5f863625ad07b1 (patch) | |
tree | 7d851220e9f36bd56685da6569b5bce35065c12f /meta/classes/binconfig.bbclass | |
parent | 9bab90e7232196ac5c798d0a8910f0af96567b17 (diff) | |
download | openembedded-core-44856a298c538382c0bb6fadad5f863625ad07b1.tar.gz openembedded-core-44856a298c538382c0bb6fadad5f863625ad07b1.tar.bz2 openembedded-core-44856a298c538382c0bb6fadad5f863625ad07b1.zip |
STAGING_BINDIR: No longer need to rename -native binconfig binaries, set STAGING_BINDIR correctly
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1221 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/binconfig.bbclass')
-rw-r--r-- | meta/classes/binconfig.bbclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 317e080fc5..dadf2dddfc 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -20,11 +20,6 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s -# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages -def is_native(d): - import bb.data - return ["","-native"][bb.data.inherits_class('native', d)] - BINCONFIG_GLOB ?= "*-config" do_install_append() { @@ -52,9 +47,9 @@ do_install_append() { do_stage_append() { for config in `find ${S} -name '${BINCONFIG_GLOB}'`; 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 + configname=`basename $config` + install -d ${STAGING_BINDIR_CROSS} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname + chmod u+x ${STAGING_BINDIR_CROSS}/$configname done } |