diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-01-24 13:28:33 -0800 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-01-27 16:56:14 -0800 |
commit | 8bde0fa9b53b6d974b9c46cd937e0dadf3e3b260 (patch) | |
tree | 330f8effea31c94b547286c2c4cb810f7ad97f05 | |
parent | 587ac72206cadf36594a911a71251089901a3f0d (diff) | |
download | meta-intel-8bde0fa9b53b6d974b9c46cd937e0dadf3e3b260.tar.gz |
crystalforest: 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>
4 files changed, 12 insertions, 0 deletions
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 e98d03f6..37474e30 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,5 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | |||
3 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen" | 6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen" |
4 | KMACHINE_crystalforest-gladden = "crystalforest" | 7 | KMACHINE_crystalforest-gladden = "crystalforest" |
5 | KBRANCH_crystalforest-gladden = "standard/preempt-rt/base" | 8 | KBRANCH_crystalforest-gladden = "standard/preempt-rt/base" |
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 f3f036e9..f93bb711 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -1,5 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | |||
3 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
4 | KMACHINE_crystalforest-gladden = "crystalforest" | 7 | KMACHINE_crystalforest-gladden = "crystalforest" |
5 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" | 8 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/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 e7cf16d1..ed9ee3c8 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -1,5 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | |||
3 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
4 | KMACHINE_crystalforest-gladden = "crystalforest" | 7 | KMACHINE_crystalforest-gladden = "crystalforest" |
5 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" | 8 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/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 47a24372..31125178 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend | |||
@@ -1,5 +1,8 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | |||
3 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
4 | KMACHINE_crystalforest-gladden = "crystalforest" | 7 | KMACHINE_crystalforest-gladden = "crystalforest" |
5 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" | 8 | KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" |