diff mbox series

libtracefs: use meson to build

Message ID 20260820120646.21045-1-jaipaul.cheernam@est.tech
State New
Headers show
Series libtracefs: use meson to build | expand

Commit Message

Jaipaul Cheernam Aug. 20, 2026, 12:06 p.m. UTC 
Since 1.8.3 libtracefs supports meson

- cleanup copyright and stale license comment from recipe
- drop the makefile patch for preserving ownership in cp
- remove do_compile:prepend for sqlhist.tab.c and custom do_installs
  as the meson class handles
- Add PACKAGECONFIG entries for doc, samples and utest.
  Meson defaults these to true,  disable them to match the previous make-based build

Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
 ...not-preserve-ownership-in-cp-command.patch | 28 -------------------
 .../libtracefs/libtracefs_1.8.3.bb            | 21 ++++++--------
 2 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
diff mbox series

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
deleted file mode 100644
index 7eaf29e4c4..0000000000
--- a/meta/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-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.3.bb b/meta/recipes-kernel/libtracefs/libtracefs_1.8.3.bb
index c010555b1f..0f3d0ebe2c 100644
--- a/meta/recipes-kernel/libtracefs/libtracefs_1.8.3.bb
+++ b/meta/recipes-kernel/libtracefs/libtracefs_1.8.3.bb
@@ -1,6 +1,3 @@ 
-# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
 SUMMARY = "Library to access the kernel tracefs directory"
 HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
 LICENSE = "GPL-2.0-or-later AND LGPL-2.1-or-later"
@@ -10,16 +7,14 @@  SECTION = "libs"
 DEPENDS = "libtraceevent bison-native flex-native"
 
 SRCREV = "6fad6a14ba0d4c4b437d9e4eed7098d4bb07b4fc"
-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 \
-           "
+SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[doc] = ",-Ddoc=false,asciidoc-native xmlto-native"
+PACKAGECONFIG[samples] = ",-Dsamples=false"
+PACKAGECONFIG[utest] = ",-Dutest=false,cunit"
 
-inherit pkgconfig bash-completion
+EXTRA_OEMESON = "--bindir=${sbindir}"
 
-do_compile:prepend() {
-    touch ${S}/src/sqlhist.tab.c
-}
+inherit meson pkgconfig bash-completion
 
-do_install() {
-    oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig
-}