From 8f426abb4ecb08116a84a73eae005c24411dc680 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 24 Jan 2014 13:28:33 -0800 Subject: 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 --- meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend | 3 +++ meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 3 +++ meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | 3 +++ meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend | 3 +++ meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend | 3 +++ meta-sys940x/recipes-kernel/linux/linux-yocto_3.8.bbappend | 3 +++ 6 files changed, 18 insertions(+) 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + KMETA = "meta" 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_sys940x = "sys940x" KMACHINE_sys940x = "sys940x" 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + COMPATIBLE_MACHINE_sys940x = "sys940x" KMACHINE_sys940x = "sys940x" 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + KMETA = "meta" LINUX_VERSION = "3.10.19" 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + KMETA = "meta" 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGE_ARCH_sys940x = "${MACHINE_ARCH}" +PACKAGE_ARCH_sys940x-noemgd = "${MACHINE_ARCH}" + KMETA = "meta" LINUX_VERSION = "3.8.13" -- cgit v1.2.3-54-g00ecf