summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-11-14 11:55:25 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-14 17:01:26 +0000
commit41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a (patch)
tree9e5e1491d7ad2b91c57d58c15ed5c258632f9432
parent2a9944514362445ee891f6e77c4ae62950e247b3 (diff)
downloadopenembedded-core-contrib-41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a.tar.gz
openembedded-core-contrib-41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a.tar.bz2
openembedded-core-contrib-41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a.zip
linux-yocto-rt/3.10: fix ntp merge issue
Updating the -rt SRCREVs to pick up the following fix: ntp: fix ntp_notify_cmos_timer merge issue PREEMPT_RT_FULL has a stubbed ntp_notify_cmos_timer due to a bad merge. Renaming and restoring the full -rt functionality to this routine. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb6
1 files changed, 3 insertions, 3 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 ab36e6ad02..c8b9888f48 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
KBRANCH = "standard/preempt-rt/base"
KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c"
-SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75"
-SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7"
+SRCREV_machine ?= "baed5453f830d06075a4480ec0ded8ff785828bc"
+SRCREV_machine_qemuppc ?= "26a465af89793c7dc5a81661449c5a9f0ad06dee"
+SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"