summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-10-17 09:38:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-18 10:56:55 +0100
commitf7244423c700204e6875d1c32e3973676529e561 (patch)
tree70c35cdbf883a9ad1a8f838e053939ed0c709276 /meta
parent84bbfd85836ea17d2f3e84022e676579eb0b9097 (diff)
downloadpoky-f7244423c700204e6875d1c32e3973676529e561.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) Signed-off-by: Bruce Ashfield <bruce.ashfield@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_4.14.bb2
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
14SRCREV_machine ?= "c37a14708f5b618602f84f83f902346e055824c3" 14SRCREV_machine ?= "ad0965b9752eb70d74206dc942803d1ea6c6c93d"
15SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3" 15SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \