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-rt_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-rt_3.10.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index 91b37d3c19..8acbd2e59b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | |||
@@ -3,13 +3,13 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" | |||
3 | 3 | ||
4 | require recipes-kernel/linux/linux-yocto.inc | 4 | require recipes-kernel/linux/linux-yocto.inc |
5 | 5 | ||
6 | SRCREV_machine ?= "38885f87b7240587194597c3658ba2c0ac5960e7" | 6 | SRCREV_machine ?= "94a79d98e40b51466600fb3375ad2908c38dd192" |
7 | SRCREV_machine_qemuppc ?= "535a7403beabe9c4aa394a1f9efa755eb33966c8" | 7 | SRCREV_machine_qemuppc ?= "c1dcbac7751652784f180fdb91f87bc37fba8c52" |
8 | SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" | 8 | SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
11 | 11 | ||
12 | LINUX_VERSION ?= "3.10.59" | 12 | LINUX_VERSION ?= "3.10.62" |
13 | 13 | ||
14 | PV = "${LINUX_VERSION}+git${SRCPV}" | 14 | PV = "${LINUX_VERSION}+git${SRCPV}" |
15 | 15 | ||