From 26648ae952b9bea5da5f3ee1b02e698e9a1a0560 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 24 Aug 2020 15:00:39 -0400 Subject: linux-yocto-rt/5.8: fix lttng-modules build Integrating the following commit(s) to linux-yocto-rt/5.8: commit baee1af811ec9bd3e64990543b7cc85e77c8f50c (HEAD -> master) Author: Bruce Ashfield Date: Sun Aug 23 22:50:30 2020 -0400 linux-yocto/rt: enable kprobes by default Traditionally kprobes and -rt haven't mixed well, but recent -rt kernels support kprobes without issues. lttng now requires kprobes to be enabled, or the following error is thrown: | build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.12.2-r0/lttng-modules-2.12.2/wrapper/kallsyms.c:20:3: error: #error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0" | 20 | # error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0" | | ^~~~~ | make[3]: *** [build/tmp/work-shared/qemux86-64/kernel-source/scripts/Makefile.build:280: build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.12.2-r0/lttng-modules-2.12.2/wrapper/kallsyms.o] Error 1 By including the kprobes fragment into the -rt kernel by default, we fix the issue. (From OE-Core rev: 0ebbcbefc8c1a6731b81b7f1aba695a3665a256e) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index 7b5588f01f..ca791a3b14 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" -SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689" +SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}" -- cgit v1.2.3-54-g00ecf