intel-common: Make using intel-common override opt-in

Currently the intel-core*-common.inc files also include the
intel-common-pkgarch.inc, forcing the introduction of the intel-common
PACKAGE_ARCH. Coupling this with the addition of the intel-common
MACHINE_OVERRIDE, means that even MACHINE_ARCH packages can be
influenced by intel-common overrides, which is not desirable.

Remove the intel-common-pkgarch.inc from the intel-core*common.inc
include files, requiring BSPs wanting to use the intel-common mechanism
to explicitly include it. This obviates the need to reset the
linux-yocto PACKAGE_ARCH to MACHINE_ARCH.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>

6 files changed, 0 insertions, 12 deletions

diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
index ef5646ab..63fc6042 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 KMETA = "meta"
 
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 4ebb2289..6c7eec47 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sys940x = "sys940x"
 KMACHINE_sys940x = "sys940x"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 4ebb2289..6c7eec47 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sys940x = "sys940x"
 KMACHINE_sys940x = "sys940x"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 871cae21..1b71a773 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 KMETA = "meta"
 LINUX_VERSION = "3.10.19"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 89f79e0e..37dbb38d 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 KMETA = "meta"
 
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 2342aeaa..fd3e87bd 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}"
-PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}"
 
 KMETA = "meta"
 LINUX_VERSION = "3.8.13"