diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-10 04:20:19 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-06 14:13:40 +0000 |
commit | d7c61053da96d675c3912a45ee448c20ae91721b (patch) | |
tree | a8af39ef7b3470e52c7ea5e8371e4f2acbe66a3e /meta/recipes-kernel/linux/linux-yocto_3.10.bb | |
parent | b52e2f4f2e7fb6ffafcadc578854c53bf9ef6fa0 (diff) | |
download | poky-d7c61053da96d675c3912a45ee448c20ae91721b.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)
(From OE-Core rev: 03d54a2ad086d017ced0f79f1770c7d7ae6219cc)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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.bb | 18 |
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 043f2e0b23..978775a7d3 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" | |||
10 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" | 10 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" |
11 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 11 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
12 | 12 | ||
13 | SRCREV_machine_qemuarm ?= "896f87d1003331d7a307c9f855cdbb78c9a2a033" | 13 | SRCREV_machine_qemuarm ?= "f6b075991c91b7c2bb641b389757863e2fd34b8c" |
14 | SRCREV_machine_qemumips ?= "9e616945464ab97a050da96a025d88c809d05144" | 14 | SRCREV_machine_qemumips ?= "48afdc632312b6cc26fe7bca151cfb66b2ebc308" |
15 | SRCREV_machine_qemuppc ?= "692b2de590668de2e15461879cf9301a0e6fedf6" | 15 | SRCREV_machine_qemuppc ?= "cf35ea9ac92153858dadd2f4ab71cccd3a1fa26b" |
16 | SRCREV_machine_qemux86 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" | 16 | SRCREV_machine_qemux86 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" |
17 | SRCREV_machine_qemux86-64 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" | 17 | SRCREV_machine_qemux86-64 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" |
18 | SRCREV_machine_qemumips64 ?= "d237cab9f483ea512ded4ea311902763c1a3ae68" | 18 | SRCREV_machine_qemumips64 ?= "ebdb374ca5130ef456d0baf75b6fe7a242932d0d" |
19 | SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" | 19 | SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" |
20 | SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" | 20 | SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" |
21 | 21 | ||
22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
23 | 23 | ||
24 | LINUX_VERSION ?= "3.10.59" | 24 | LINUX_VERSION ?= "3.10.62" |
25 | 25 | ||
26 | PV = "${LINUX_VERSION}+git${SRCPV}" | 26 | PV = "${LINUX_VERSION}+git${SRCPV}" |
27 | 27 | ||