[meta-intel] [PATCH 21/27] fri2: Set PACKAGE_ARCH to MACHINE_ARCH explicitly

[Darren Hart]

The new intel-common.inc sets the default of the PACKAGE_ARCH for the
linux-yocto kernel recipes to DEFAULTTUNE_kernel. Revert the existing
recipes to MACHINE_ARCH until they can be removed in favor of a more
unified mechanism.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  |    3 +++
 .../linux/linux-yocto-rt_3.4.bbappend              |    3 +++
 .../linux/linux-yocto-rt_3.8.bbappend              |    3 +++
 .../linux/linux-yocto-tiny_3.4.bbappend            |    3 +++
 .../linux/linux-yocto-tiny_3.8.bbappend            |    3 +++
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |    3 +++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    3 +++
 .../recipes-kernel/linux/linux-yocto_3.8.bbappend  |    3 +++
 8 files changed, 24 insertions(+)

diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
index 4ba873e..103f2a7 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/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 bd4786d..88697ff 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,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/preempt-rt/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 b73e036..442de5f 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,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/preempt-rt/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 a71ff90..bdca928 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,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/tiny/base"
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 13408c0..a4c2838 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,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/tiny/base"
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 c9b2779..b4909b2 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 LINUX_VERSION = "3.10.19"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
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 5212cb6..1110569 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "fri2"
 KBRANCH_fri2 = "standard/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 54879c7..7703d06 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,5 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}"
+
 LINUX_VERSION = "3.8.13"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
-- 
1.7.9.5