Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 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 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | Upstream-Status: Inappropriate [embedded specific] |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 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 | |