From: Jitesh Pramodray Date: Fri, 26 Feb 2021 21:52:18 +0000 (+0000) Subject: linux-fslc: Fix build issue when compiling LTTng X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=97d2ea4;p=meta-freescale.git linux-fslc: Fix build issue when compiling LTTng Fix compile error when building lttng using bitbake by: Enable kprobes configuration enabled from menuconfig Run diffconfig Copy the resulting diff contents into all the linux-fslc defconfig files Add end of line in defconfig Built the kernel with no warnings from do_kernel_configcheck task Add correct defconfig configuration for armv8a Tested on master branch from 3rd March 2021 Error: riotboard/fsl-community-bsp/build/tmp/work/ imx6dl_riotboard-fslc-linux-gnueabi/lttng-modules/2.12.4-r0/ lttng-modules-2.12.4/wrapper/kallsyms.c:20:3: error: 20 | # error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0" | ^~~~~ make[3]: *** [riotboard/fsl-community-bsp/build/tmp/work-shared/ imx6dl-riotboard/kernel-source/scripts/Makefile.build:279: riotboard/fsl-community-bsp/build/tmp/work/ imx6dl_riotboard-fslc-linux-gnueabi/lttng-modules/2.12.4-r0/ lttng-modules-2.12.4/wrapper/kallsyms.o] Error 1 Compile flags: cd ~/riotboard/fsl-community-bsp MACHINE=imx6dl-riotboard DISTRO=fslc-framebuffer source setup-environment build bitbake fsl-image-machine-test Signed-off-by: Jitesh Pramodray --- diff --git a/recipes-kernel/linux/linux-fslc/armv8a/defconfig b/recipes-kernel/linux/linux-fslc/armv8a/defconfig index 57c06075..df595480 100644 --- a/recipes-kernel/linux/linux-fslc/armv8a/defconfig +++ b/recipes-kernel/linux/linux-fslc/armv8a/defconfig @@ -1090,3 +1090,8 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 5e216107..127e38f2 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -473,3 +473,9 @@ CONFIG_DEBUG_FS=y CONFIG_PROVE_LOCKING=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index bb70acc6..21672504 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig @@ -185,3 +185,9 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m CONFIG_FONTS=y CONFIG_FONT_8x8=y +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index a9c6f32a..a913c0dd 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig @@ -172,3 +172,9 @@ CONFIG_PROVE_LOCKING=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_USER=y +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set +