summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-08-17 11:27:30 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-18 17:01:06 +0100
commitf2bf71a3928996a3839220839d472cef64cb8348 (patch)
tree1e4d57358a8984477c97dcfe0cfc8645587aef28 /meta/recipes-kernel/lttng/lttng-modules
parent6c2e02772ed1d5308bd50463472f147d9a6ffea4 (diff)
downloadpoky-f2bf71a3928996a3839220839d472cef64cb8348.tar.gz
lttng-modules: update to 2.13.0
Updating to 2.13.0, so we can pick up the latest -stable and support for 5.14+ kernels. We refresh one patch for new context, and update the LICENSE checksum due to commit 2df37e95fa4303 [Cleanup: Move headers from toplevel to include/lttng/]. which impacted the LICENSE file (but licensing is the same). MODULES_MODULE_SYMVERS_LOCATION must also be specified in this release, as the lttng build has moved the module target to a 'src' subdirectory. (From OE-Core rev: 5dad15af8b3423ad9631edf3eef6e77902f1b36e) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch32
1 files changed, 10 insertions, 22 deletions
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
index e411242272..a852834344 100644
--- 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
@@ -13,37 +13,25 @@ available, allowing it to be kept being pulled by default.
13Upstream-Status: Inappropriate [embedded specific] 13Upstream-Status: Inappropriate [embedded specific]
14 14
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 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>
16--- 18---
17 Makefile | 9 +++++---- 19 Makefile | 9 +++++----
18 1 file changed, 5 insertions(+), 4 deletions(-) 20 1 file changed, 5 insertions(+), 4 deletions(-)
19 21
20diff --git a/Makefile b/Makefile 22Index: lttng-modules-2.13.0/Makefile
21index 8602649..75550cc 100644 23===================================================================
22--- a/Makefile 24--- lttng-modules-2.13.0.orig/Makefile
23+++ b/Makefile 25+++ lttng-modules-2.13.0/Makefile
24@@ -8,10 +8,7 @@ ifneq ($(KERNELRELEASE),) 26@@ -7,6 +7,11 @@
25 # and defines the modules to be built.
26 27
27 ifdef CONFIG_LOCALVERSION # Check if dot-config is included. 28 obj-$(CONFIG_LTTNG) += src/
28- ifeq ($(CONFIG_TRACEPOINTS),)
29- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
30- endif # CONFIG_TRACEPOINTS
31- endif # ifdef CONFIG_LOCALVERSION
32+ ifneq ($(CONFIG_TRACEPOINTS),)
33
34 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
35
36@@ -94,6 +91,10 @@ ifneq ($(KERNELRELEASE),)
37 obj-$(CONFIG_LTTNG) += lib/
38 obj-$(CONFIG_LTTNG) += tests/
39 29
40+ else 30+ ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
31+ ifneq ($(CONFIG_TRACEPOINTS),)
41+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) 32+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
42+ endif # CONFIG_TRACEPOINTS 33+ endif # CONFIG_TRACEPOINTS
43+ endif # ifdef CONFIG_LOCALVERSION 34+ endif # ifdef CONFIG_LOCALVERSION
44 else # KERNELRELEASE 35 else # KERNELRELEASE
45 36
46 # This part of the Makefile is used when the 'make' command is runned in the 37 # This part of the Makefile is used when the 'make' command is runned in the
47--
482.1.4
49