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

lttng-modules: update devupstream to v2.13-rc

Browse Source 
To support builds against v5.13+ kernels, bumping the devupstream
to 2.13 and the 2.13-rc series.

Along with the SRCREV update, a port of the existing CONFIG_TRACEPOINTS
patch from the main Makefile to src/Kbuild is done.

The LICENSE file was part of commit [Cleanup: Move headers from toplevel
to include/lttng/], so we adjust the checksum to the new fie contents.

(From OE-Core rev: 18bf7b0eafc5331b0b33c0ae777374e24df741b8)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2021-05-15 11:45:21 -04:00
committed by Richard Purdie
parent 7fedc98498
commit f98ea33f63
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch Normal file
View File

@@ -0,0 +1,37 @@
From 0287f5c32b9fd99078e71c22ca679343d18f1513 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sat, 15 May 2021 10:26:38 -0400
Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
Taken from a previous patch to the main lttng-modules Makefile, by
Otavio Salvador:
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: Inappropriate [embedded specific]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
src/Kbuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Kbuild b/src/Kbuild
index 7137874f..18a43b50 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -2,7 +2,7 @@
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)
+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
endif # CONFIG_TRACEPOINTS
endif # ifdef CONFIG_LOCALVERSION
--
2.19.1

10
meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb
View File

@@ -37,13 +37,13 @@ python do_package_prepend() {
}
BBCLASSEXTEND = "devupstream:target"
LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4"
DEFAULT_PREFERENCE_class-devupstream = "-1"
SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.12 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \
file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
"
SRCREV_class-devupstream = "92cc3e7f76a545a2cd4828576971f1eea83f4e68"
PV_class-devupstream = "2.12.5+git${SRCPV}"
SRCREV_class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933"
PV_class-devupstream = "2.13.0-rc2+git${SRCPV}"
S_class-devupstream = "${WORKDIR}/git"
SRCREV_FORMAT ?= "lttng_git"