summaryrefslogtreecommitdiffstats
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:30:34 (GMT)
commitf122b5a10114416c55d015305fdd011d86e71353 (patch)
tree6ca42fbc01eeff13349cee3513c71e4dd9a087ed
parent626bc169369eaef6bc640a3fb895fde22aa1ae2c (diff)
downloadmeta-intel-f122b5a10114416c55d015305fdd011d86e71353.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>
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend13
1 files changed, 6 insertions, 7 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 56f2eed..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,23 +1,22 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3 3LINUX_VERSION = "3.10.33"
4LINUX_VERSION = "3.10.19"
5 4
6COMPATIBLE_MACHINE_fri2 = "fri2" 5COMPATIBLE_MACHINE_fri2 = "fri2"
7KMACHINE_fri2 = "fri2" 6KMACHINE_fri2 = "fri2"
8KBRANCH_fri2 = "standard/fri2" 7KBRANCH_fri2 = "standard/fri2"
9KERNEL_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"
10SRCREV_meta_fri2 = "d9cd83c0292bd4e2a6754a96761027252e726a42" 9SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40"
11SRCREV_machine_fri2 = "a9ec82e355130160f9094e670bd5be0022a84194" 10SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7"
12SRCREV_emgd_fri2 = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" 11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
13SRC_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"
14 13
15COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 14COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
16KMACHINE_fri2-noemgd = "fri2" 15KMACHINE_fri2-noemgd = "fri2"
17KBRANCH_fri2-noemgd = "standard/fri2" 16KBRANCH_fri2-noemgd = "standard/fri2"
18KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
19SRCREV_meta_fri2-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" 18SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40"
20SRCREV_machine_fri2-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" 19SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7"
21 20
22module_autoload_iwlwifi = "iwlwifi" 21module_autoload_iwlwifi = "iwlwifi"
23 22