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***

3 files changed, 22 insertions, 27 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
 }
diff --git a/classes/e.bbclass b/classes/e.bbclass
index ae8fea0d5d..f20c1f8b60 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -8,23 +8,19 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
-def binconfig_suffix(d):
-	import bb
-        return ["","-native"][bb.data.inherits_class('native', d)]
-
-export CURL_CONFIG		= "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
-export EDB_CONFIG		= "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
-export EET_CONFIG		= "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
-export EVAS_CONFIG		= "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
-export ECORE_CONFIG		= "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
-export EMBRYO_CONFIG		= "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
-export ENGRAVE_CONFIG		= "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
-export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
-export EPSILON_CONFIG		= "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
-export EPEG_CONFIG		= "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
-export ESMART_CONFIG		= "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
-export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
-export IMLIB2_CONFIG		= "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
+export CURL_CONFIG		= "${STAGING_BINDIR_CROSS}/curl-config"
+export EDB_CONFIG		= "${STAGING_BINDIR_CROSS}/edb-config"
+export EET_CONFIG		= "${STAGING_BINDIR_CROSS}/eet-config"
+export EVAS_CONFIG		= "${STAGING_BINDIR_CROSS}/evas-config"
+export ECORE_CONFIG		= "${STAGING_BINDIR_CROSS}/ecore-config"
+export EMBRYO_CONFIG		= "${STAGING_BINDIR_CROSS}/embryo-config"
+export ENGRAVE_CONFIG		= "${STAGING_BINDIR_CROSS}/engrave-config"
+export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR_CROSS}/enlightenment-config"
+export EPSILON_CONFIG		= "${STAGING_BINDIR_CROSS}/epsilon-config"
+export EPEG_CONFIG		= "${STAGING_BINDIR_CROSS}/epeg-config"
+export ESMART_CONFIG		= "${STAGING_BINDIR_CROSS}/esmart-config"
+export FREETYPE_CONFIG		= "${STAGING_BINDIR_CROSS}/freetype-config"
+export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 
 do_compile_prepend() {
 	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index be5ef9dcb0..9b0345a5b8 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -13,6 +13,10 @@ libdirectory = "src/lib"
 libraries = "lib${SRCNAME}"
 headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
 
+def efl_is_native(d):
+    import bb
+    return ["","-native"][bb.data.inherits_class('native', d)]
+
 do_stage_append () {
 	for i in ${libraries}
 	do
@@ -24,7 +28,7 @@ do_stage_append () {
 	done
 
 	# Install binaries automatically for native builds
-	if [ "${@binconfig_suffix(d)}" = "-native" ]
+	if [ "${@efl_is_native(d)}" = "-native" ]
 	then
 
 		# Most EFL binaries start with the package name