[meta-intel] [PATCH 1/2] intel-common-pkgarch.inc: add to MACHINEOVERRIDES in machine confs instead

[California Sullivan]

This provides a stable override to anything that inherits those MACHINE
conf files. One example where this was problematic previously is with
x32 support.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
This patch could use a review to make sure I'm not overlooking anything.

The only time the the INTEL_COMMON_PACKAGE_ARCH is neither of these
things is when corei7-64-x32 is used, but in that override isn't being used
anywhere except a linux-yocto bbappend adding the corei7-64 override to
it... We may as well just be direct, right?

This did pass x32 and musl x32 builds.

 conf/machine/include/intel-common-pkgarch.inc | 1 -
 conf/machine/intel-core2-32.conf              | 2 ++
 conf/machine/intel-corei7-64.conf             | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc
index d0f208bd..8b0551dd 100644
--- a/conf/machine/include/intel-common-pkgarch.inc
+++ b/conf/machine/include/intel-common-pkgarch.inc
@@ -12,4 +12,3 @@ PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
 PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
 PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
 PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}"
-MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index aa8a5793..6b0da0c8 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -16,6 +16,8 @@ MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
 
+MACHINEOVERRIDES =. "core2-32-intel-common:"
+
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
             ${XSERVER_X86_FBDEV} \
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 78c52eed..de118817 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -16,6 +16,8 @@ MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
 
 MACHINE_EXTRA_RRECOMMENDS += "lms8"
 
+MACHINEOVERRIDES =. "corei7-64-intel-common:"
+
 # Enable optional dpdk:
 COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64"
 COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64"
-- 
2.14.3