3 files changed, 6 insertions, 11 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):
                 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/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 76bc40c845..9c4d30be25 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -163,7 +163,7 @@ S = "${WORKDIR}/${P}"
 B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
-STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
+STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
 STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
 STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
index 721f067bf6..69caf6cf73 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
@@ -7,7 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
 SRC_URI += " file://stop-fc-cache.patch;patch=1"
 
 EXTRA_OEMAKE = ""
-EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config-native"
+EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config"
 
 do_stage () {
         oe_runmake install