summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch37
1 files changed, 0 insertions, 37 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
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