diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-01-24 13:28:32 -0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-01-27 16:56:14 -0800 |
| commit | c4fc0c595845ec274881383c4522df39339adbc6 (patch) | |
| tree | 438c94785aa47b8af54fe2230e2388b377ca675f | |
| parent | 9ca21ad7239c3e04ef36a9949b86275f25806a96 (diff) | |
| download | meta-intel-c4fc0c595845ec274881383c4522df39339adbc6.tar.gz | |
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 <dvhart@linux.intel.com>
6 files changed, 11 insertions, 0 deletions
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 5 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 4 | KMACHINE_chiefriver = "chiefriver" | 6 | KMACHINE_chiefriver = "chiefriver" |
| 5 | KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" | 7 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 2 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 3 | KMACHINE_chiefriver = "chiefriver" | 4 | KMACHINE_chiefriver = "chiefriver" |
| 4 | 5 | ||
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 5 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 4 | KMACHINE_chiefriver = "chiefriver" | 6 | KMACHINE_chiefriver = "chiefriver" |
| 5 | 7 | ||
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 5 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 4 | KMACHINE_chiefriver = "chiefriver" | 6 | KMACHINE_chiefriver = "chiefriver" |
| 5 | KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" | 7 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 5 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 4 | KMACHINE_chiefriver = "chiefriver" | 6 | KMACHINE_chiefriver = "chiefriver" |
| 5 | KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" | 7 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_chiefriver = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" | 5 | COMPATIBLE_MACHINE_chiefriver = "chiefriver" |
| 4 | KMACHINE_chiefriver = "chiefriver" | 6 | KMACHINE_chiefriver = "chiefriver" |
| 5 | KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" | 7 | KBRANCH_chiefriver = "standard/common-pc-64/chiefriver" |