From 192ba6dd4ceb7c1de86bddccb8b803ceaa54d513 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sun, 30 Mar 2014 19:16:11 -0700 Subject: common: Update linux-yocto 3.10 SRCREV (3.10.34-LTSI) Update to the HEAD of standard/base (3.10.34-LTSI). This also works around an open issue with do_validate_branches where feature branches are reset the HEAD of the machine branch if they contain that commit. Signed-off-by: Nitin A Kamble Reviewed-by: Darren Hart --- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 650919f6..5a740b5b 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,19 +1,20 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# For NUC KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" -LINUX_VERSION_core2-32-intel-common = "3.10.33" +LINUX_VERSION_core2-32-intel-common = "3.10.34" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -SRCREV_meta_core2-32-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_core2-32-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/base" KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" -LINUX_VERSION_corei7-64-intel-common = "3.10.33" +LINUX_VERSION_corei7-64-intel-common = "3.10.34" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -SRCREV_meta_corei7-64-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" KBRANCH_intel-corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" @@ -21,5 +22,5 @@ KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} # For Crystalforest and Romley module_autoload_uio = "uio" -# For FRI2 +# For FRI2, NUC module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf