[1/6] libtracefs: import from meta-openembedded

Message ID 20240819074202.34144-2-patrick.barsanti@amarulasolutions.com
State New
Headers show
Series
  • Add support for rtla tool
Related show

Commit Message

Patrick Barsanti Aug. 19, 2024, 7:41 a.m. UTC
Import from meta-openembedded at commit ce7274164c ("libtracefs:
upgrade 1.8.0 -> 1.8.1").
libtracefs is a dependency of rtla, so it is necessary to add it before
adding rtla itself.

Signed-off-by: Patrick Barsanti <patrick.barsanti@amarulasolutions.com>
---
 ...not-preserve-ownership-in-cp-command.patch | 28 +++++++++++++++++++
 .../libtracefs/libtracefs_1.8.1.bb            | 22 +++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
 create mode 100644 meta/recipes-kernel/libtracefs/libtracefs_1.8.1.bb

Patch

diff --git a/meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
new file mode 100644
index 0000000000..7eaf29e4c4
--- /dev/null
+++ b/meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
@@ -0,0 +1,28 @@ 
+From ab6f78bfd6811c648ee71663cfc4dc8be151a519 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 21 Dec 2022 22:50:56 -0800
+Subject: [PATCH] makefile: Do not preserve ownership in cp command
+
+Fixes
+ERROR: libtracefs-1.6.3-r0 do_package_qa: QA Issue: libtracefs: /usr/lib/libtracefs.so is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7f4f5c3..1ba7b9d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -296,7 +296,7 @@ endif # DESTDIR = ""
+ 
+ install_libs: libs install_pkgconfig
+ 	$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \
+-		cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ)
++		cp --no-preserve=ownership --recursive $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ)
+ 	$(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644)
+ 	$(Q)$(call install_ld_config)
+ 
diff --git a/meta/recipes-kernel/libtracefs/libtracefs_1.8.1.bb b/meta/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
new file mode 100644
index 0000000000..66869b29a9
--- /dev/null
+++ b/meta/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
@@ -0,0 +1,22 @@ 
+# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "Library to parse raw trace event formats	"
+HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
+                    file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
+SECTION = "libs"
+DEPENDS = "libtraceevent bison-native flex-native"
+
+SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa"
+SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \
+           file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \
+           "
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+do_install() {
+    oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig
+}