summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/binconfig.bbclass13
1 files changed, 9 insertions, 4 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index c660fd9cae..a599dec3f2 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -19,11 +19,16 @@ 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)]
+
do_stage_append() {
for config in `find ${S} -name '*-config'`; do
- configname=`basename $config`
- 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
+ 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
done
}