From b25eb7e4dfee7802d4eae657fa5e482a1a010190 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 26 Sep 2014 20:25:18 +0000 Subject: linux-yocto*_3.14: Update SRCREV_meta to avoid rt build failure Fixes [YOCTO 6710] linux-yocto-rt recipe failing to build This meta update reorganizes the intel-common ktype and driver meta data which was causing the wrong branch to be checked out, resulting in a build failure for the rt kernel. Update both linux-yocto and linux-yocto-rt to use the updated intel-common meta data. Signed-off-by: Darren Hart Cc: Bruce Ashfield Acked-by: Tom Zanussi --- common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'common/recipes-kernel') diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend index 1aa46881..a5edfff9 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" LINUX_VERSION_core2-32-intel-common = "3.14.4" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -SRCREV_meta_core2-32-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" +SRCREV_meta_core2-32-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" SRCREV_machine_core2-32-intel-common = "08229402523bdb153dceed0a7260180837396e7f" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" @@ -10,7 +10,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" LINUX_VERSION_corei7-64-intel-common = "3.14.4" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -SRCREV_meta_corei7-64-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" +SRCREV_meta_corei7-64-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" SRCREV_machine_corei7-64-intel-common = "08229402523bdb153dceed0a7260180837396e7f" KMACHINE_corei7-64-intel-common = "intel-corei7-64" KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index b367adb4..22faabbe 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -5,7 +5,7 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" LINUX_VERSION_core2-32-intel-common = "3.14.4" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -SRCREV_meta_core2-32-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" +SRCREV_meta_core2-32-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" SRCREV_machine_core2-32-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/base" @@ -13,7 +13,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" LINUX_VERSION_corei7-64-intel-common = "3.14.4" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -SRCREV_meta_corei7-64-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" +SRCREV_meta_corei7-64-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" SRCREV_machine_corei7-64-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" KMACHINE_corei7-64-intel-common = "intel-corei7-64" KBRANCH_corei7-64-intel-common = "standard/base" -- cgit v1.2.3-54-g00ecf