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>

64 files changed, 4 insertions, 96 deletions

diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc
index 16c12f6d..8c469499 100644
--- a/conf/machine/include/intel-core2-32-common.inc
+++ b/conf/machine/include/intel-core2-32-common.inc
@@ -3,6 +3,5 @@
 #
 
 DEFAULTTUNE ?= "core2-32"
-require intel-common-pkgarch.inc
 require conf/machine/include/tune-core2.inc
 require conf/machine/include/x86-base.inc
diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc
index 935cd227..00282569 100644
--- a/conf/machine/include/intel-corei7-64-common.inc
+++ b/conf/machine/include/intel-corei7-64-common.inc
@@ -3,6 +3,5 @@
 #
 
 DEFAULTTUNE ?= "corei7-64"
-require intel-common-pkgarch.inc
 require conf/machine/include/tune-corei7.inc
 require conf/machine/include/x86-base.inc
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index a702c809..0db30d0d 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -5,4 +5,5 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 
-include conf/machine/include/intel-core2-32-common.inc
+require conf/machine/include/intel-core2-32-common.inc
+require conf/machine/include/intel-common-pkgarch.inc
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index abf38727..23af4eb1 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -5,5 +5,5 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 
-# Should these be require?
-include conf/machine/include/intel-corei7-64-common.inc
+require conf/machine/include/intel-corei7-64-common.inc
+require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
index 116677a2..a370cbd9 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver = "chiefriver"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 2ab1a077..9e4a4a07 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver  = "chiefriver"
 
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index c6eb3762..1922fe54 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver  = "chiefriver"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
index c23177d5..000f5d1d 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver = "chiefriver"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
index aa4b55db..c9a3619d 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver  = "chiefriver"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 49c35e66..57bcdc95 100644
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver = "chiefriver"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
index db6e699c..a1fccfb7 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index ef883940..7b9b7621 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 1e86e0c4..649e5196 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 1e86e0c4..649e5196 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1a1c1fb0..06021c98 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 86ef95f9..375a6ff7 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay  = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 9bb8b90f..9be86d2d 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay = "crownbay"
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 37474e30..8a8e9192 100644
--- a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen"
 KMACHINE_crystalforest-gladden  = "crystalforest"
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
index f93bb711..51551ef4 100644
--- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
 KMACHINE_crystalforest-gladden  = "crystalforest"
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
index ed9ee3c8..e4559c2f 100644
--- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
 KMACHINE_crystalforest-gladden  = "crystalforest"
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 31125178..7cdb024a 100644
--- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_crystalforest = "${MACHINE_ARCH}"
-PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
 KMACHINE_crystalforest-gladden  = "crystalforest"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
index 419e501a..27714a6a 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow = "emenlow"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 3bc4684c..15fc8473 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow  = "emenlow"
 
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 3bc4684c..15fc8473 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow  = "emenlow"
 
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 2381d95b..60757838 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow = "emenlow"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
index b4971569..a5c0acac 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow  = "emenlow"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
index b4a8c004..072b4597 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_emenlow = "${MACHINE_ARCH}"
-PACKAGE_ARCH_emenlow-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow = "emenlow"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
index 103f2a72..52605615 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 88697ff2..5bab3e9b 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 442de5f4..875bf8a5 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
index bdca9285..2afea0b9 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
index a4c2838b..b4d2dfd6 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
index b4909b2e..56f2eed8 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 LINUX_VERSION = "3.10.19"
 
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 11105690..f909c82c 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "fri2"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 7703d068..54e8a65f 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
 
 LINUX_VERSION = "3.8.13"
 
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
index f921ae8d..5d6f92fd 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 917853eb..e506bf43 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 KMACHINE_jasperforest  = "jasperforest"
 
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index d14a6ff2..24e63b58 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 KMACHINE_jasperforest  = "jasperforest"
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 963336d7..45ab6b96 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 93ceb76e..3182c571 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 002b7643..459c640f 100644
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_jasperforest = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index c4f40376..59a8db28 100644
--- a/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450 = "atom-pc"
 
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 669479c5..1fb68195 100644
--- a/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-n450/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450 = "atom-pc"
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_3.4.bbappend
index b6225ea1..46cb12c4 100644
--- a/meta-n450/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-n450/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450  = "atom-pc"
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 1faaf612..fcc20eb7 100644
--- a/meta-n450/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-n450/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_n450 = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450  = "atom-pc"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
index e46debc8..6b631c60 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_nuc = "nuc"
 KMACHINE_nuc = "chiefriver"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 426c0370..ec67460a 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_nuc = "nuc"
 KMACHINE_nuc = "chiefriver"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 8f34a013..f1e9cbaa 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_nuc = "nuc"
 KMACHINE_nuc  = "chiefriver"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 975f1b8f..8fadce28 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_nuc = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_nuc = "nuc"
 KMACHINE_nuc = "chiefriver"
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 49498dcd..6fc0682d 100644
--- a/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
-PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_romley = "romley"
 
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 1da1b56e..1873ec90 100644
--- a/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
-PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_romley = "romley"
 
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.8.bbappend
index d0b2f834..1a2c30e8 100644
--- a/meta-romley/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_romley = "${MACHINE_ARCH}"
-PACKAGE_ARCH_romley-ivb = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_romley = "romley"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
index f2b3cf4f..f09fbf60 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 68e1c488..531a3ad5 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 KMACHINE_sugarbay  = "sugarbay"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 68e1c488..531a3ad5 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 KMACHINE_sugarbay  = "sugarbay"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index e0bf22c4..8811fca5 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 4fe66f80..bf047352 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 15966948..1cdce2f6 100644
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 
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"