summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-03-24 18:13:33 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2014-03-24 18:31:23 (GMT)
commitc87883c7509b8ae55b71055ff05e233cddb71d5d (patch)
tree82351cd7c26fff2f33af742fed02634ec560207d /meta-fri2
parent5549d4fcda9d72e4c0336645d7bc07a259ef2684 (diff)
downloadmeta-intel-c87883c7509b8ae55b71055ff05e233cddb71d5d.tar.gz
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 <dvhart@linux.intel.com> (cherry picked from commit f122b5a10114416c55d015305fdd011d86e71353)
Diffstat (limited to 'meta-fri2')
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend12
1 files changed, 6 insertions, 6 deletions
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 c9b2779..4b81b61 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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION = "3.10.19" 3LINUX_VERSION = "3.10.33"
4 4
5COMPATIBLE_MACHINE_fri2 = "fri2" 5COMPATIBLE_MACHINE_fri2 = "fri2"
6KMACHINE_fri2 = "fri2" 6KMACHINE_fri2 = "fri2"
7KBRANCH_fri2 = "standard/fri2" 7KBRANCH_fri2 = "standard/fri2"
8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
9SRCREV_meta_fri2 = "d9cd83c0292bd4e2a6754a96761027252e726a42" 9SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40"
10SRCREV_machine_fri2 = "a9ec82e355130160f9094e670bd5be0022a84194" 10SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7"
11SRCREV_emgd_fri2 = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" 11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
12SRC_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" 12SRC_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"
13 13
14COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 14COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
15KMACHINE_fri2-noemgd = "fri2" 15KMACHINE_fri2-noemgd = "fri2"
16KBRANCH_fri2-noemgd = "standard/fri2" 16KBRANCH_fri2-noemgd = "standard/fri2"
17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
18SRCREV_meta_fri2-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" 18SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40"
19SRCREV_machine_fri2-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" 19SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7"
20 20
21module_autoload_iwlwifi = "iwlwifi" 21module_autoload_iwlwifi = "iwlwifi"
22 22