aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-12-10 04:22:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:54 +0000
commitfc152d9fe7aedc65dc20d8ba4dfa5d02f12a0beb (patch)
treea59547120ba74d85f963c95a322226db777368bf /meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
parent88fb7391496312aff9332e8370c91a52ce160517 (diff)
downloadopenembedded-core-contrib-fc152d9fe7aedc65dc20d8ba4dfa5d02f12a0beb.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) 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-rt_3.14.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index fc86725806..7dbf82c3e6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
require recipes-kernel/linux/linux-yocto.inc
-SRCREV_machine ?= "baad552ea168dc31db31f0be188edefaa28a4aec"
-SRCREV_machine_qemuppc ?= "db4221ed2e1c6c617ad07d3374f630bbb59cf8b5"
-SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742"
+SRCREV_machine ?= "7f0712d10247ffca8e48e944f49707bcf9117ead"
+SRCREV_machine_qemuppc ?= "8bed2a975d491c963cff56496f7e35f5bcff926f"
+SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"