diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-14 11:55:25 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:17 +0000 |
| commit | 58b59bd9273a22e8da85d285b0547f0b8926c891 (patch) | |
| tree | 0d1f25ae89f58792e830f5a0bfbe74f0896e8d34 /meta | |
| parent | 0ebd48b90e188dbc6f2d401e5856f30cbe78e5af (diff) | |
| download | poky-58b59bd9273a22e8da85d285b0547f0b8926c891.tar.gz | |
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.
(From OE-Core master rev: 41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a)
(From OE-Core rev: 0336b83df666617d61e8cd39c2d2a7f9c745064c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 6 |
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 | |||
| 3 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
| 4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" | 4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" |
| 5 | 5 | ||
| 6 | SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c" | 6 | SRCREV_machine ?= "baed5453f830d06075a4480ec0ded8ff785828bc" |
| 7 | SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75" | 7 | SRCREV_machine_qemuppc ?= "26a465af89793c7dc5a81661449c5a9f0ad06dee" |
| 8 | SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" | 8 | SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684" |
| 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 | ||