diff options
Diffstat (limited to 'meta/classes')
| -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): | |||
| 20 | s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" | 20 | s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" |
| 21 | return s | 21 | return s |
| 22 | 22 | ||
| 23 | # Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages | ||
| 24 | def is_native(d): | ||
| 25 | import bb.data | ||
| 26 | return ["","-native"][bb.data.inherits_class('native', d)] | ||
| 27 | |||
| 28 | BINCONFIG_GLOB ?= "*-config" | 23 | BINCONFIG_GLOB ?= "*-config" |
| 29 | 24 | ||
| 30 | do_install_append() { | 25 | do_install_append() { |
| @@ -52,9 +47,9 @@ do_install_append() { | |||
| 52 | 47 | ||
| 53 | do_stage_append() { | 48 | do_stage_append() { |
| 54 | for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do | 49 | for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do |
| 55 | configname=`basename $config`${@is_native(d)} | 50 | configname=`basename $config` |
| 56 | install -d ${STAGING_BINDIR} | 51 | install -d ${STAGING_BINDIR_CROSS} |
| 57 | cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname | 52 | cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname |
| 58 | chmod u+x ${STAGING_BINDIR}/$configname | 53 | chmod u+x ${STAGING_BINDIR_CROSS}/$configname |
| 59 | done | 54 | done |
| 60 | } | 55 | } |
