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:23:59 +0100 |
| commit | 6215ffec6a3d5069cc74ae9853167c3c6395b1db (patch) | |
| tree | 5ec5df004403e5cfc96e2f7e06ec6bc922d8eb20 /meta | |
| parent | 34cac40670e94a9e3ffc2a734ce1f826dc60516b (diff) | |
| download | openembedded-core-6215ffec6a3d5069cc74ae9853167c3c6395b1db.tar.gz openembedded-core-6215ffec6a3d5069cc74ae9853167c3c6395b1db.tar.bz2 openembedded-core-6215ffec6a3d5069cc74ae9853167c3c6395b1db.zip | |
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 @@ +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 + 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}" 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" |