1*4882a593SmuzhiyunFrom 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Bruce Ashfield <bruce.ashfield@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 15 May 2021 10:26:38 -0400 4*4882a593SmuzhiyunSubject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunTaken from a previous patch to the main lttng-modules Makefile, by 7*4882a593SmuzhiyunOtavio Salvador: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun The lttng-modules are being pulled by the tools-profile image feature, 10*4882a593Smuzhiyun however, not every kernel has the CONFIG_TRACEPOINTS feature enabled. 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun This change makes the build do not fail when CONFIG_TRACEPOINTS is not 13*4882a593Smuzhiyun available, allowing it to be kept being pulled by default. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunUpstream-Status: Inappropriate [embedded specific] 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun src/Kbuild | 7 ++++++- 20*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/src/Kbuild b/src/Kbuild 23*4882a593Smuzhiyunindex 7137874..04eb5c9 100644 24*4882a593Smuzhiyun--- a/src/Kbuild 25*4882a593Smuzhiyun+++ b/src/Kbuild 26*4882a593Smuzhiyun@@ -2,10 +2,13 @@ 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun ifdef CONFIG_LOCALVERSION # Check if dot-config is included. 29*4882a593Smuzhiyun ifeq ($(CONFIG_TRACEPOINTS),) 30*4882a593Smuzhiyun- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) 31*4882a593Smuzhiyun+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) 32*4882a593Smuzhiyun+ DISABLE_MODULE = y 33*4882a593Smuzhiyun endif # CONFIG_TRACEPOINTS 34*4882a593Smuzhiyun endif # ifdef CONFIG_LOCALVERSION 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun+ifneq ($(DISABLE_MODULE),y) 37*4882a593Smuzhiyun+ 38*4882a593Smuzhiyun TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun lttng_check_linux_version = $(shell pwd)/include/linux/version.h 41*4882a593Smuzhiyun@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o 42*4882a593Smuzhiyun obj-$(CONFIG_LTTNG) += probes/ 43*4882a593Smuzhiyun obj-$(CONFIG_LTTNG) += lib/ 44*4882a593Smuzhiyun obj-$(CONFIG_LTTNG) += tests/ 45*4882a593Smuzhiyun+ 46*4882a593Smuzhiyun+endif # DISABLE_MODULE 47