diff options
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 32 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb) | 6 |
2 files changed, 14 insertions, 24 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 index e411242272..a852834344 100644 --- 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 | |||
@@ -13,37 +13,25 @@ available, allowing it to be kept being pulled by default. | |||
13 | Upstream-Status: Inappropriate [embedded specific] | 13 | Upstream-Status: Inappropriate [embedded specific] |
14 | 14 | ||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | [bva: modified for lttng-modules 2.13+ context] | ||
17 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
16 | --- | 18 | --- |
17 | Makefile | 9 +++++---- | 19 | Makefile | 9 +++++---- |
18 | 1 file changed, 5 insertions(+), 4 deletions(-) | 20 | 1 file changed, 5 insertions(+), 4 deletions(-) |
19 | 21 | ||
20 | diff --git a/Makefile b/Makefile | 22 | Index: lttng-modules-2.13.0/Makefile |
21 | index 8602649..75550cc 100644 | 23 | =================================================================== |
22 | --- a/Makefile | 24 | --- lttng-modules-2.13.0.orig/Makefile |
23 | +++ b/Makefile | 25 | +++ lttng-modules-2.13.0/Makefile |
24 | @@ -8,10 +8,7 @@ ifneq ($(KERNELRELEASE),) | 26 | @@ -7,6 +7,11 @@ |
25 | # and defines the modules to be built. | ||
26 | 27 | ||
27 | ifdef CONFIG_LOCALVERSION # Check if dot-config is included. | 28 | obj-$(CONFIG_LTTNG) += src/ |
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 | 29 | ||
40 | + else | 30 | + ifdef CONFIG_LOCALVERSION # Check if dot-config is included. |
31 | + ifneq ($(CONFIG_TRACEPOINTS),) | ||
41 | + $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) | 32 | + $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) |
42 | + endif # CONFIG_TRACEPOINTS | 33 | + endif # CONFIG_TRACEPOINTS |
43 | + endif # ifdef CONFIG_LOCALVERSION | 34 | + endif # ifdef CONFIG_LOCALVERSION |
44 | else # KERNELRELEASE | 35 | else # KERNELRELEASE |
45 | 36 | ||
46 | # This part of the Makefile is used when the 'make' command is runned in the | 37 | # 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_2.12.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb index c46faaee58..b95d7ecaaf 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb | |||
@@ -3,7 +3,7 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE" | |||
3 | DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" | 3 | DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" |
4 | HOMEPAGE = "https://lttng.org/" | 4 | HOMEPAGE = "https://lttng.org/" |
5 | LICENSE = "LGPLv2.1 & GPLv2 & MIT" | 5 | LICENSE = "LGPLv2.1 & GPLv2 & MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" |
7 | 7 | ||
8 | inherit module | 8 | inherit module |
9 | 9 | ||
@@ -13,12 +13,14 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
13 | file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ | 13 | file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "95ac2a2cf92d85d23ffbdaca6a1ec0d7c167211d1e0fb850ab90004a3f475eaa" | 16 | SRC_URI[sha256sum] = "5ebf2b3cd128b3a1c8afaea1e98d5a6f7f0676fd524fcf72361c34d9dc603356" |
17 | 17 | ||
18 | export INSTALL_MOD_DIR="kernel/lttng-modules" | 18 | export INSTALL_MOD_DIR="kernel/lttng-modules" |
19 | 19 | ||
20 | EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" | 20 | EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" |
21 | 21 | ||
22 | MODULES_MODULE_SYMVERS_LOCATION = "src" | ||
23 | |||
22 | do_install:append() { | 24 | do_install:append() { |
23 | # Delete empty directories to avoid QA failures if no modules were built | 25 | # Delete empty directories to avoid QA failures if no modules were built |
24 | find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; | 26 | find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; |