summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_3.10.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-12-10 09:20:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:54 (GMT)
commit88fb7391496312aff9332e8370c91a52ce160517 (patch)
tree4f24ff0d69cd44580bb98afb0a43d10fd5e8a74d /meta/recipes-kernel/linux/linux-yocto_3.10.bb
parentd02bb17bfc61aa31f3e4fbb511d5923d7e57bf3d (diff)
downloadpoky-88fb7391496312aff9332e8370c91a52ce160517.tar.gz
linux-yocto/3.10: update to v3.10.62
Updating to the latest korg -stable update for the 3.10 series. Minor merge conflict resolution was done with the standard/ltsi and standard/preempt-rt branches. (From OE-Core rev: a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_3.10.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index 043f2e0..978775a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -10,18 +10,18 @@ KBRANCH_qemux86 ?= "standard/common-pc/base"
10KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" 10KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
11KBRANCH_qemumips64 ?= "standard/mti-malta64" 11KBRANCH_qemumips64 ?= "standard/mti-malta64"
12 12
13SRCREV_machine_qemuarm ?= "896f87d1003331d7a307c9f855cdbb78c9a2a033" 13SRCREV_machine_qemuarm ?= "f6b075991c91b7c2bb641b389757863e2fd34b8c"
14SRCREV_machine_qemumips ?= "9e616945464ab97a050da96a025d88c809d05144" 14SRCREV_machine_qemumips ?= "48afdc632312b6cc26fe7bca151cfb66b2ebc308"
15SRCREV_machine_qemuppc ?= "692b2de590668de2e15461879cf9301a0e6fedf6" 15SRCREV_machine_qemuppc ?= "cf35ea9ac92153858dadd2f4ab71cccd3a1fa26b"
16SRCREV_machine_qemux86 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" 16SRCREV_machine_qemux86 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d"
17SRCREV_machine_qemux86-64 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" 17SRCREV_machine_qemux86-64 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d"
18SRCREV_machine_qemumips64 ?= "d237cab9f483ea512ded4ea311902763c1a3ae68" 18SRCREV_machine_qemumips64 ?= "ebdb374ca5130ef456d0baf75b6fe7a242932d0d"
19SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" 19SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d"
20SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" 20SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
23 23
24LINUX_VERSION ?= "3.10.59" 24LINUX_VERSION ?= "3.10.62"
25 25
26PV = "${LINUX_VERSION}+git${SRCPV}" 26PV = "${LINUX_VERSION}+git${SRCPV}"
27 27