diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules')
2 files changed, 17 insertions, 45 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 6d81c81efe..76a5787c37 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 @@ | |||
1 | From 0287f5c32b9fd99078e71c22ca679343d18f1513 Mon Sep 17 00:00:00 2001 | 1 | From 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001 |
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | 2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> |
3 | Date: Sat, 15 May 2021 10:26:38 -0400 | 3 | Date: Sat, 15 May 2021 10:26:38 -0400 |
4 | Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning | 4 | Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning |
@@ -16,22 +16,31 @@ Upstream-Status: Inappropriate [embedded specific] | |||
16 | 16 | ||
17 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | 17 | Signed-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 | ||
22 | diff --git a/src/Kbuild b/src/Kbuild | 22 | diff --git a/src/Kbuild b/src/Kbuild |
23 | index 7137874f..18a43b50 100644 | 23 | index 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) |
36 | 2.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 a852834344..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 1b0e574d680101105a6c1e8931c78824f5a97a42 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Mon, 5 Sep 2016 17:08:56 +0000 | ||
4 | Subject: [PATCH] Makefile: Do not fail if CONFIG_TRACEPOINTS is not enabled | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | The lttng-modules are being pulled by the tools-profile image feature, | ||
8 | however, not every kernel has the CONFIG_TRACEPOINTS feature enabled. | ||
9 | |||
10 | This change makes the build do not fail when CONFIG_TRACEPOINTS is not | ||
11 | available, allowing it to be kept being pulled by default. | ||
12 | |||
13 | Upstream-Status: Inappropriate [embedded specific] | ||
14 | |||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | [bva: modified for lttng-modules 2.13+ context] | ||
17 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
18 | --- | ||
19 | Makefile | 9 +++++---- | ||
20 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
21 | |||
22 | Index: 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 | ||