diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-10 04:22:10 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-06 14:13:41 +0000 |
| commit | 36e42c0ddb7a40b3022e9b165560622479f1aa5c (patch) | |
| tree | 0fd9b8a3fe53bd5beda3d8cadc1980867b0b6e5b /meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | |
| parent | 446acfb5a474b23041b46c49732474f2d415160d (diff) | |
| download | poky-36e42c0ddb7a40b3022e9b165560622479f1aa5c.tar.gz | |
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
Updating the 3.14 tree to the latest korg 3.14.26, as well as
integrating 3.14 LTSI content, and refreshing preempt-rt. Minor
conflict resolutions were performed between ltsi, stable and -rt
(From OE-Core rev: 8c30cec8233605cbec334fcc5c2b9ef5cf8f6482)
(From OE-Core rev: 015a64ea82866fd621ed4f9a946b6c5db7d8c3d7)
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-tiny_3.14.bb')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index d168a2acbb..67bf4624f8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | |||
| @@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.24" | |||
| 8 | 8 | ||
| 9 | KMETA = "meta" | 9 | KMETA = "meta" |
| 10 | 10 | ||
| 11 | SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" | 11 | SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" |
| 12 | SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" | 12 | SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" |
| 13 | 13 | ||
| 14 | PV = "${LINUX_VERSION}+git${SRCPV}" | 14 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 15 | 15 | ||