summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-04-18 17:27:32 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-04-22 13:10:28 (GMT)
commitacf2b4013d981563081bc072e778c4caaab7c67d (patch)
treec6e6ad21f91f6f99abbb2d80299f0cf15fcd08c2
parent38c58952f4beb481c05e9b531421ead8ba4a1d11 (diff)
downloadmeta-intel-acf2b4013d981563081bc072e778c4caaab7c67d.tar.gz
sys940x: Update linux-yocto 3.10 SRCREV (3.10.35-LTSI)
Update to the HEAD of standard/sys940x (3.10.35-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 <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend12
1 files changed, 6 insertions, 6 deletions
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 46660bd..40a9e26 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,20 +1,20 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3KMETA = "meta" 3KMETA = "meta"
4LINUX_VERSION = "3.10.19" 4LINUX_VERSION = "3.10.35"
5 5
6COMPATIBLE_MACHINE_sys940x = "sys940x" 6COMPATIBLE_MACHINE_sys940x = "sys940x"
7KMACHINE_sys940x = "sys940x" 7KMACHINE_sys940x = "sys940x"
8KBRANCH_sys940x = "standard/sys940x" 8KBRANCH_sys940x = "standard/sys940x"
9KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.18" 9KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.18"
10SRCREV_meta_sys940x = "d9cd83c0292bd4e2a6754a96761027252e726a42" 10SRCREV_meta_sys940x = "7df9ef8ee47dc9023044614210f4c1d9d916dd5f"
11SRCREV_machine_sys940x = "a9ec82e355130160f9094e670bd5be0022a84194" 11SRCREV_machine_sys940x = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
12SRCREV_emgd_sys940x = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" 12SRCREV_emgd_sys940x = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
13SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" 13SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
14 14
15COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd" 15COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
16KMACHINE_sys940x-noemgd = "sys940x" 16KMACHINE_sys940x-noemgd = "sys940x"
17KBRANCH_sys940x-noemgd = "standard/sys940x" 17KBRANCH_sys940x-noemgd = "standard/sys940x"
18KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb" 18KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb"
19SRCREV_meta_sys940x-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" 19SRCREV_meta_sys940x-noemgd = "7df9ef8ee47dc9023044614210f4c1d9d916dd5f"
20SRCREV_machine_sys940x-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" 20SRCREV_machine_sys940x-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"