diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2016-09-05 14:20:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-06 10:24:04 +0100 |
commit | f5b4ca2ad7a75a1b339a931ebb35d9238ba47b4b (patch) | |
tree | c4b81d6a348f3b3ec65ac6a909d06e1c35c9c985 /meta/recipes-kernel/lttng | |
parent | 700501808ac3421c189dafb039ae536ecfdfdc6f (diff) | |
download | poky-f5b4ca2ad7a75a1b339a931ebb35d9238ba47b4b.tar.gz |
lttng-modules: Do not fail if CONFIG_TRACEPOINTS is not enabled
The lttng-modules are being pulled by the tools-profile image feature,
however, not every kernel has the CONFIG_TRACEPOINTS feature enabled.
This change makes the build do not fail when CONFIG_TRACEPOINTS is not
available, allowing it to be kept being pulled by default.
(From OE-Core rev: 6215ffec6a3d5069cc74ae9853167c3c6395b1db)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 49 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_git.bb | 3 |
2 files changed, 51 insertions, 1 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 new file mode 100644 index 0000000000..6a91f3258b --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | |||
@@ -0,0 +1,49 @@ | |||
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: Inapropriate [embedded specific] | ||
14 | |||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | --- | ||
17 | Makefile | 9 +++++---- | ||
18 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/Makefile b/Makefile | ||
21 | index 8602649..75550cc 100644 | ||
22 | --- a/Makefile | ||
23 | +++ b/Makefile | ||
24 | @@ -8,10 +8,7 @@ ifneq ($(KERNELRELEASE),) | ||
25 | # and defines the modules to be built. | ||
26 | |||
27 | ifdef CONFIG_LOCALVERSION # Check if dot-config is included. | ||
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 | |||
40 | + else | ||
41 | + $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) | ||
42 | + endif # CONFIG_TRACEPOINTS | ||
43 | + endif # ifdef CONFIG_LOCALVERSION | ||
44 | else # KERNELRELEASE | ||
45 | |||
46 | # This part of the Makefile is used when the 'make' command is runned in the | ||
47 | -- | ||
48 | 2.1.4 | ||
49 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb index 6d596a417c..70145413a3 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_git.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb | |||
@@ -13,7 +13,8 @@ PV = "2.8.0+git${SRCPV}" | |||
13 | 13 | ||
14 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux' | 14 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux' |
15 | 15 | ||
16 | SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8" | 16 | SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8 \ |
17 | file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch" | ||
17 | 18 | ||
18 | export INSTALL_MOD_DIR="kernel/lttng-modules" | 19 | export INSTALL_MOD_DIR="kernel/lttng-modules" |
19 | 20 | ||