mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lttng-modules: Do not fail if CONFIG_TRACEPOINTS is not enabled

Browse Source 
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>
This commit is contained in:
Otavio Salvador
2016-09-05 14:20:20 -03:00
committed by Richard Purdie
parent 700501808a
commit f5b4ca2ad7
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch Normal file
View File

@@ -0,0 +1,49 @@
From 1b0e574d680101105a6c1e8931c78824f5a97a42 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 5 Sep 2016 17:08:56 +0000
Subject: [PATCH] Makefile: Do not fail if CONFIG_TRACEPOINTS is not enabled
Organization: O.S. Systems Software LTDA.
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.
Upstream-Status: Inapropriate [embedded specific]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 8602649..75550cc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,7 @@ ifneq ($(KERNELRELEASE),)
# and defines the modules to be built.
ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
- ifeq ($(CONFIG_TRACEPOINTS),)
- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
- endif # CONFIG_TRACEPOINTS
- endif # ifdef CONFIG_LOCALVERSION
+ ifneq ($(CONFIG_TRACEPOINTS),)
TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
@@ -94,6 +91,10 @@ ifneq ($(KERNELRELEASE),)
obj-$(CONFIG_LTTNG) += lib/
obj-$(CONFIG_LTTNG) += tests/
+ else
+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+ endif # CONFIG_TRACEPOINTS
+ endif # ifdef CONFIG_LOCALVERSION
else # KERNELRELEASE
# This part of the Makefile is used when the 'make' command is runned in the
--
2.1.4

3
meta/recipes-kernel/lttng/lttng-modules_git.bb
View File

@@ -13,7 +13,8 @@ PV = "2.8.0+git${SRCPV}"
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8"
SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch"
export INSTALL_MOD_DIR="kernel/lttng-modules"