[OE-core] [PATCH] lttng-modules: Work around yocto bug 13424

zhe.he at windriver.com zhe.he at windriver.com
Mon Feb 17 04:08:25 UTC 2020


From: He Zhe <zhe.he at windriver.com>

Before Yocto bug 13424 is fixed, devupstream cannot work with multilib.
To provide git based lttng-modules recipe for latest source code, let's
just include tarball based recipe and overwrite related variables.

Signed-off-by: He Zhe <zhe.he at windriver.com>
---
 meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 12 ------------
 meta/recipes-kernel/lttng/lttng-modules_git.bb    | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules_git.bb

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
index c833ff7..4e75c6e 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
@@ -29,15 +29,3 @@ python do_package_prepend() {
     if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
         bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
 }
-
-BBCLASSEXTEND = "devupstream:target"
-LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
-DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \
-           file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
-           file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
-           "
-SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
-PV_class-devupstream = "2.11.1+git${SRCPV}"
-S_class-devupstream = "${WORKDIR}/git"
-SRCREV_FORMAT ?= "lttng_git"
diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb
new file mode 100644
index 0000000..c6d1924
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb
@@ -0,0 +1,11 @@
+require lttng-modules_2.11.1.bb
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \
+           file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
+           file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
+           "
+SRCREV = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
+PV = "2.11.1+git${SRCPV}"
+S = "${WORKDIR}/git"
-- 
2.7.4



More information about the Openembedded-core mailing list