X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_nitrogen6x.inc;h=5864354b5bf2bc3d11e30b1cc28812b795ebccd0;hb=4c67a503983f0547a8bcd253122367bec6b20982;hp=782e618a2bb476e501e49acf96e01fa5b05f192e;hpb=7e6f5bb94352ac0b6cd5c5cdd3035eec6c6bc559;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 782e618a2..5864354b5 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler"
 # etnaviv support.
 MACHINEOVERRIDES .= ":use-mainline-bsp"
 
+# Disable meta-freescale package architecure mangling, as it causes
+# issues with AGL's explicit setting of DEFAULTTUNE.
+INHERIT_remove = "fsl-dynamic-packagearch"
+MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+
 # Disable the meta-freescale weston-init bbappend as it conflicts
 # with AGL's.
 BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"