summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2021-08-25 13:20:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-26 07:07:55 (GMT)
commit85a97d39851984959c2a0f45675b1a8c3e6c1a2a (patch)
treebb9eb4dace44ae13db844c29fef563d474c3a2f4 /meta/recipes-kernel
parentef3ad59d2ae54b12871c4e867edadaac42b2e357 (diff)
downloadpoky-85a97d39851984959c2a0f45675b1a8c3e6c1a2a.tar.gz
lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again
Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was updated with the 2.13.0 update (commit 5dad15af), but unfortunately it no longer did what it was intended to do. There is also 0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch, which was based on the former patch, but it too does not solve the problem. Unify the two patches, and actually disable building of the kernel module if CONFIG_TRACEPOINTS is not enabled, the way it was intended. (From OE-Core rev: f2411917c09a31d154d29060f6c7e4ce7d544fc7) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch25
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch37
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb10
3 files changed, 21 insertions, 51 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index 6d81c81..76a5787 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -1,4 +1,4 @@
1From 0287f5c32b9fd99078e71c22ca679343d18f1513 Mon Sep 17 00:00:00 2001 1From 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com> 2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Sat, 15 May 2021 10:26:38 -0400 3Date: Sat, 15 May 2021 10:26:38 -0400
4Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning 4Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
@@ -16,22 +16,31 @@ Upstream-Status: Inappropriate [embedded specific]
16 16
17Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 17Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
18--- 18---
19 src/Kbuild | 2 +- 19 src/Kbuild | 7 ++++++-
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 6 insertions(+), 1 deletion(-)
21 21
22diff --git a/src/Kbuild b/src/Kbuild 22diff --git a/src/Kbuild b/src/Kbuild
23index 7137874f..18a43b50 100644 23index 7137874..04eb5c9 100644
24--- a/src/Kbuild 24--- a/src/Kbuild
25+++ b/src/Kbuild 25+++ b/src/Kbuild
26@@ -2,7 +2,7 @@ 26@@ -2,10 +2,13 @@
27 27
28 ifdef CONFIG_LOCALVERSION # Check if dot-config is included. 28 ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
29 ifeq ($(CONFIG_TRACEPOINTS),) 29 ifeq ($(CONFIG_TRACEPOINTS),)
30- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) 30- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
31+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) 31+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
32+ DISABLE_MODULE = y
32 endif # CONFIG_TRACEPOINTS 33 endif # CONFIG_TRACEPOINTS
33 endif # ifdef CONFIG_LOCALVERSION 34 endif # ifdef CONFIG_LOCALVERSION
34 35
35-- 36+ifneq ($(DISABLE_MODULE),y)
362.19.1 37+
37 38 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
39
40 lttng_check_linux_version = $(shell pwd)/include/linux/version.h
41@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o
42 obj-$(CONFIG_LTTNG) += probes/
43 obj-$(CONFIG_LTTNG) += lib/
44 obj-$(CONFIG_LTTNG) += tests/
45+
46+endif # DISABLE_MODULE
diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
deleted file mode 100644
index a852834..0000000
--- a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 1b0e574d680101105a6c1e8931c78824f5a97a42 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Mon, 5 Sep 2016 17:08:56 +0000
4Subject: [PATCH] Makefile: Do not fail if CONFIG_TRACEPOINTS is not enabled
5Organization: O.S. Systems Software LTDA.
6
7The lttng-modules are being pulled by the tools-profile image feature,
8however, not every kernel has the CONFIG_TRACEPOINTS feature enabled.
9
10This change makes the build do not fail when CONFIG_TRACEPOINTS is not
11available, allowing it to be kept being pulled by default.
12
13Upstream-Status: Inappropriate [embedded specific]
14
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16[bva: modified for lttng-modules 2.13+ context]
17Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
18---
19 Makefile | 9 +++++----
20 1 file changed, 5 insertions(+), 4 deletions(-)
21
22Index: lttng-modules-2.13.0/Makefile
23===================================================================
24--- lttng-modules-2.13.0.orig/Makefile
25+++ lttng-modules-2.13.0/Makefile
26@@ -7,6 +7,11 @@
27
28 obj-$(CONFIG_LTTNG) += src/
29
30+ ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
31+ ifneq ($(CONFIG_TRACEPOINTS),)
32+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
33+ endif # CONFIG_TRACEPOINTS
34+ endif # ifdef CONFIG_LOCALVERSION
35 else # KERNELRELEASE
36
37 # This part of the Makefile is used when the 'make' command is runned in the
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb
index b95d7ec..109f5d6 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb
@@ -9,9 +9,9 @@ inherit module
9 9
10include lttng-platforms.inc 10include lttng-platforms.inc
11 11
12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2"
13 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ 13# Use :append here so that the patch is applied also when using devupstream
14 " 14SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
15 15
16SRC_URI[sha256sum] = "5ebf2b3cd128b3a1c8afaea1e98d5a6f7f0676fd524fcf72361c34d9dc603356" 16SRC_URI[sha256sum] = "5ebf2b3cd128b3a1c8afaea1e98d5a6f7f0676fd524fcf72361c34d9dc603356"
17 17
@@ -34,9 +34,7 @@ python do_package:prepend() {
34BBCLASSEXTEND = "devupstream:target" 34BBCLASSEXTEND = "devupstream:target"
35LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" 35LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4"
36DEFAULT_PREFERENCE:class-devupstream = "-1" 36DEFAULT_PREFERENCE:class-devupstream = "-1"
37SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \ 37SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13"
38 file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
39 "
40 38
41SRCREV:class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933" 39SRCREV:class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933"
42PV:class-devupstream = "2.13.0-rc2+git${SRCPV}" 40PV:class-devupstream = "2.13.0-rc2+git${SRCPV}"