From c87883c7509b8ae55b71055ff05e233cddb71d5d Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 24 Mar 2014 11:13:33 -0700 Subject: fri2: Update linux-yocto 3.10 SRCREV (3.10.33-LTSI) Update to the HEAD of standard/fri2 (3.10.33-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: Darren Hart (cherry picked from commit f122b5a10114416c55d015305fdd011d86e71353) --- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-fri2') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index c9b2779f..4b81b610 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,22 +1,22 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -LINUX_VERSION = "3.10.19" +LINUX_VERSION = "3.10.33" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/fri2" KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" -SRCREV_meta_fri2 = "d9cd83c0292bd4e2a6754a96761027252e726a42" -SRCREV_machine_fri2 = "a9ec82e355130160f9094e670bd5be0022a84194" -SRCREV_emgd_fri2 = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" +SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40" +SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" -SRCREV_meta_fri2-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" -SRCREV_machine_fri2-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40" +SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7" module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf