diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch index 7ae0856f85..7eaf29e4c4 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch @@ -1,4 +1,4 @@ -From 6650d0e79eea330b53635574885208a138fef97e Mon Sep 17 00:00:00 2001 +From ab6f78bfd6811c648ee71663cfc4dc8be151a519 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 21 Dec 2022 22:50:56 -0800 Subject: [PATCH] makefile: Do not preserve ownership in cp command @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 27d425c..3aea142 100644 +index 7f4f5c3..1ba7b9d 100644 --- a/Makefile +++ b/Makefile -@@ -273,7 +273,7 @@ endif # DESTDIR = "" +@@ -296,7 +296,7 @@ endif # DESTDIR = "" install_libs: libs install_pkgconfig $(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \ @@ -26,6 +26,3 @@ index 27d425c..3aea142 100644 $(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644) $(Q)$(call install_ld_config) --- -2.39.0 - diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch deleted file mode 100644 index a24dd1315b..0000000000 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f539d96ef4a34ad23d33c552d1770ab429b0220e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 Jun 2023 00:24:36 -0700 -Subject: [PATCH] tracefs-perf: Add missing headers for syscall() and SYS_* - defines - -These headers are needed to provide prototype definitions for functions -e.g. close(), syscall(), getpagesize(), getpid() - -The issue is observed with clang-16+ compiler on musl systems - -Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230614072759.316154-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj ---- - src/tracefs-perf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tracefs-perf.c b/src/tracefs-perf.c -index 96d12cd..62c1508 100644 ---- a/src/tracefs-perf.c -+++ b/src/tracefs-perf.c -@@ -1,4 +1,5 @@ --#include -+#include -+#include - #include - #include - #include --- -2.41.0 - diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb similarity index 86% rename from meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb rename to meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb index 9a408ba13c..c90ac19fa7 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 SECTION = "libs" DEPENDS = "libtraceevent bison-native flex-native" -SRCREV = "aebab37379d0fbadc702d64aca0fe5cf18676404" +SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263" 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 \ - file://0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch \ " S = "${WORKDIR}/git"