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:15 -0800 |
| commit | 8f426abb4ecb08116a84a73eae005c24411dc680 (patch) | |
| tree | db3f4e06097838bbf66fccf0a8231bf719ff254b | |
| parent | 3c28ff51870fd615e4b310ee38fb42a881872bb3 (diff) | |
| download | meta-intel-8f426abb4ecb08116a84a73eae005c24411dc680.tar.gz | |
sys940x: 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, 18 insertions, 0 deletions
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend index 563c7d75..ef5646ab 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | KMETA = "meta" | 6 | KMETA = "meta" |
| 4 | 7 | ||
| 5 | COMPATIBLE_MACHINE_sys940x = "sys940x" | 8 | COMPATIBLE_MACHINE_sys940x = "sys940x" |
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend index cc680cec..4ebb2289 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-sys940x/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_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_sys940x = "sys940x" | 6 | COMPATIBLE_MACHINE_sys940x = "sys940x" |
| 4 | KMACHINE_sys940x = "sys940x" | 7 | KMACHINE_sys940x = "sys940x" |
| 5 | 8 | ||
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend index cc680cec..4ebb2289 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend +++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_sys940x = "sys940x" | 6 | COMPATIBLE_MACHINE_sys940x = "sys940x" |
| 4 | KMACHINE_sys940x = "sys940x" | 7 | KMACHINE_sys940x = "sys940x" |
| 5 | 8 | ||
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend index 46660bd8..871cae21 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-sys940x/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_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | KMETA = "meta" | 6 | KMETA = "meta" |
| 4 | LINUX_VERSION = "3.10.19" | 7 | LINUX_VERSION = "3.10.19" |
| 5 | 8 | ||
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend index 121145bc..89f79e0e 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-sys940x/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_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | KMETA = "meta" | 6 | KMETA = "meta" |
| 4 | 7 | ||
| 5 | COMPATIBLE_MACHINE_sys940x = "sys940x" | 8 | COMPATIBLE_MACHINE_sys940x = "sys940x" |
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend index 1fe7ef9c..2342aeaa 100644 --- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-sys940x/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_sys940x = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | KMETA = "meta" | 6 | KMETA = "meta" |
| 4 | LINUX_VERSION = "3.8.13" | 7 | LINUX_VERSION = "3.8.13" |
| 5 | 8 | ||