diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
| commit | 4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (patch) | |
| tree | f2e294728789ab01a7a89fa06b6c67c5464ceab0 /classes/binconfig.bbclass | |
| parent | 4601ad28765bf7ef207974f9ad7fc209d3745088 (diff) | |
| parent | 8f19556367701b3a3fa50802903d0d67997407b7 (diff) | |
merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
and '8091ca9b08503f4700e05ee8973cec755727ed4a'
Diffstat (limited to 'classes/binconfig.bbclass')
| -rw-r--r-- | classes/binconfig.bbclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 317e080fc5..dadf2dddfc 100644 --- a/classes/binconfig.bbclass +++ b/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 } |