Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***

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
 }