From c4fc0c595845ec274881383c4522df39339adbc6 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 24 Jan 2014 13:28:32 -0800 Subject: chiefriver: 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-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 ++ meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 1 + meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | 2 ++ meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend | 2 ++ meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 ++ meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 ++ 6 files changed, 11 insertions(+) diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend index c9451a07..116677a2 100644 --- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_chiefriver = "chiefriver" KMACHINE_chiefriver = "chiefriver" KBRANCH_chiefriver = "standard/common-pc-64/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 9e4a4a07..2ab1a077 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,4 +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.8.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend index bee7e549..c6eb3762 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,5 +1,7 @@ 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 07f4d05e..c23177d5 100644 --- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_chiefriver = "chiefriver" KMACHINE_chiefriver = "chiefriver" KBRANCH_chiefriver = "standard/common-pc-64/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 45ba6c3b..aa4b55db 100644 --- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_chiefriver = "chiefriver" KMACHINE_chiefriver = "chiefriver" KBRANCH_chiefriver = "standard/common-pc-64/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 35d926d2..49c35e66 100644 --- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_chiefriver = "chiefriver" KMACHINE_chiefriver = "chiefriver" KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" -- cgit v1.2.3-54-g00ecf