diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-10-17 09:38:54 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-16 16:33:09 +0000 |
| commit | 879fec0dec4c959c732c66ee484b6964cf59bdc3 (patch) | |
| tree | e0f86c4dcf4642d1f345e360b0ded063f52463a6 /meta | |
| parent | 91bad931e58fba8b968333d89c0f7f259e4af9a2 (diff) | |
| download | poky-879fec0dec4c959c732c66ee484b6964cf59bdc3.tar.gz | |
linux-yocto-rt: fixup 4.14 merge issues
The latest -stable updates broke 4.14 -rt with some rtmutex
issues. We sync with the rt-stable tree to pickup the fix.
(From OE-Core rev: 8a172a8ac87cc63d6f89ff0f584a75fe7fcd10dd)
(From OE-Core rev: ff495ab238dc1fe0a669b4405c3b1a466ea2dbdd)
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')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index e6f42f29e6..3f60baf404 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | |||
| @@ -11,7 +11,7 @@ python () { | |||
| 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | SRCREV_machine ?= "c37a14708f5b618602f84f83f902346e055824c3" | 14 | SRCREV_machine ?= "ad0965b9752eb70d74206dc942803d1ea6c6c93d" |
| 15 | SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3" | 15 | SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3" |
| 16 | 16 | ||
| 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |