From 5a2894f2723dcdff6376f4ce7011c879ff54e16d Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 24 Jan 2014 13:28:33 -0800 Subject: fri2: Set PACKAGE_ARCH to MACHINE_ARCH explicitly 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 --- meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 3 +++ meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 3 +++ meta-fri2/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 4ba873ed..103f2a72 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 bd4786d6..88697ff2 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 b73e0368..442de5f4 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 a71ff90f..bdca9285 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 13408c09..a4c2838b 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 c9b2779f..b4909b2e 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 5212cb69..11105690 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 54879c71..7703d068 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" -- cgit v1.2.3-54-g00ecf