Skip to contentSkip to conversation

libtraceevent: Move plugins into package of its own

PATCH New Khem Raj 1 participant 2 messages Jan 7, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 libtraceevent: Move plugins into package of its own

From Peter Bergin <[email protected]>
see https://github.com/openembedded/meta-openembedded/pull/632/commits/cf672ba52f8c4d983ad9a74b67f226ac753a50f8

---
 meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.0.bb +3 -1
index bae84c7242..cff86722e4 100644
@@ -20,4 +20,6 @@ do_install() {
     oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig
 }
 
-FILES:${PN} += "${libdir}/traceevent"
+PACKAGES += "${PN}-plugins"
+
+FILES:${PN}-plugins += "${libdir}/traceevent/plugins"
Signature · 1 line
2.39.0
author
#1 lore raw

PATCH 2/2 trace-cmd: Upgrade to 3.1.5

= Drop uneeded 0001-trace-cmd-make-it-build-with-musl.patch
- Update LFS64 patch with the upstream submitted one
- Add a patch to remove useless rpaths

---
 .../0001-Do-not-emit-useless-rpath.patch      |   34 +
 ...LFS64-interfaces-off64_t-and-lseek64.patch | 1136 +++++++++++++++++
 ...01-trace-cmd-make-it-build-with-musl.patch |  132 --
 .../0002-replace-off64_t-and-lseek64.patch    |  426 -------
 .../trace-cmd/trace-cmd_2.9.1.bb              |   32 -
 .../trace-cmd/trace-cmd_3.1.5.bb              |   31 +
 6 files changed, 1201 insertions(+), 590 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/trace-cmd/files/0001-Do-not-emit-useless-rpath.patch
 create mode 100644 meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch
 delete mode 100644 meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch
 delete mode 100644 meta-oe/recipes-kernel/trace-cmd/files/0002-replace-off64_t-and-lseek64.patch
 delete mode 100644 meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb
 create mode 100644 meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
meta-oe/recipes-kernel/trace-cmd/files/0001-Do-not-emit-useless-rpath.patch new file +34 -0
new file mode 100644
index 0000000000..13a86e65d1
@@ -0,0 +1,34 @@
+From 90fbc3423b5ccdbd54b5851c32b9f92c6658d634 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 6 Jan 2023 17:30:24 -0800
+Subject: [PATCH] Do not emit useless rpath
+
+rpath is pointing to standard libdir which is un-used and yocto build QA
+flag it, there is no need to set rpaths when building in this
+environment
+
+Fixes
+do_package_qa: QA Issue: trace-cmd: /usr/bin/trace-cmd contains probably-redundant RPATH /usr/lib [useless-rpaths]
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ scripts/utils.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/utils.mk b/scripts/utils.mk
+index 3fc2d74f..309a8599 100644
+--- a/scripts/utils.mk
++++ b/scripts/utils.mk
+@@ -64,7 +64,7 @@ do_compile =							\
+ 
+ do_app_build =						\
+ 	($(print_app_build)				\
+-	$(CC) $^ -rdynamic -Wl,-rpath=$(libdir) -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
++	$(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
+ 
+ do_build_static_lib =				\
+ 	($(print_static_lib_build)		\
+-- 
+2.39.0
+
meta-oe/recipes-kernel/trace-cmd/files/0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch new file +1136 -0

1,136 lines not on this page · raw message

meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch deleted +0 -132

132 lines not on this page · raw message

meta-oe/recipes-kernel/trace-cmd/files/0002-replace-off64_t-and-lseek64.patch deleted +0 -426

426 lines not on this page · raw message

meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb deleted +0 -32
deleted file mode 100644
index 51e46533de..0000000000
@@ -1,32 +0,0 @@
-SUMMARY = "User-space front-end command-line tool for ftrace"
-
-LICENSE = "GPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=873f48a813bded3de6ebc54e6880c4ac"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \
-           file://0001-trace-cmd-make-it-build-with-musl.patch \
-           file://0002-replace-off64_t-and-lseek64.patch \
-           "
-
-SRCREV = "530b1a0caef39466e16bbd49de5afef89656f03f"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "libtraceevent libtracefs zstd xmlto-native asciidoc-native"
-
-inherit pkgconfig
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_compile() {
-        oe_runmake libdir_relative=${BASELIB} libs
-        oe_runmake libdir_relative=${BASELIB} all
-}
-
-do_install() {
-       oe_runmake libdir_relative=${BASELIB} etcdir=${sysconfdir} DESTDIR=${D} install install_libs
-       mkdir -p ${D}${libdir}/traceevent/plugins/${BPN}
-       mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/
-}
-
-FILES:${PN} += "${libdir}/traceevent ${libdir}/traceevent/plugins ${libdir}/tracefs"
meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb new file +31 -0
new file mode 100644
index 0000000000..50d73df03a
@@ -0,0 +1,31 @@
+SUMMARY = "User-space front-end command-line tool for ftrace"
+
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \
+    "
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \
+           file://0001-Replace-LFS64-interfaces-off64_t-and-lseek64.patch \
+           file://0001-Do-not-emit-useless-rpath.patch"
+SRCREV = "18233e4c32857cb7ddd4960beeec8360ed834fc5"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "libtraceevent libtracefs zstd xmlto-native asciidoc-native swig-native bison-native flex-native"
+
+inherit pkgconfig bash-completion
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile() {
+        oe_runmake libdir_relative=${BASELIB} libs
+        oe_runmake libdir_relative=${BASELIB} all
+}
+
+do_install() {
+       oe_runmake libdir_relative=${BASELIB} etcdir=${sysconfdir} pkgconfig_dir=${libdir}/pkgconfig DESTDIR=${D} install install_libs
+       # Because makefile uses cp instead of install we need to change owner of files
+       chown -R root:root ${D}${libdir}
+}
Signature · 1 line
2.39.0