From f97f9bfb5f4d7560cba22967f8437e6a480affb2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 25 Jul 2024 17:30:27 +0200 Subject: [PATCH] package/libtracefs: bump to version 1.8.1 Let's drop local patches since they have been committed. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-meson-build-tracefs-mmap-by-default.patch | 34 ---------------- ...ATH_MAX-if-it-is-not-already-defined.patch | 40 ------------------- package/libtracefs/libtracefs.hash | 2 +- package/libtracefs/libtracefs.mk | 2 +- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch delete mode 100644 package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch diff --git a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch deleted file mode 100644 index 4a462aab66..0000000000 --- a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7d15d7744d957b1721d8e202bd5095b7c449570f Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 10 Jan 2024 21:39:25 +0100 -Subject: [PATCH] libtracefs meson: build tracefs-mmap by default - -Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed -for linking by other object files. - -Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com - -Signed-off-by: Giulio Benetti -Signed-off-by: Steven Rostedt (Google) -Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=7d15d7744d957b1721d8e202bd5095b7c449570f -[yann.morin.1998@free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/meson.build b/src/meson.build -index 5b76554..f7a98b9 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -11,6 +11,7 @@ sources= [ - 'tracefs-instance.c', - 'tracefs-kprobes.c', - 'tracefs-marker.c', -+ 'tracefs-mmap.c', - 'tracefs-record.c', - 'tracefs-sqlhist.c', - 'tracefs-tools.c', --- -2.43.0 - diff --git a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch deleted file mode 100644 index 121fee5adf..0000000000 --- a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ba750812f68f0f3314494558496c23f934f8faff Mon Sep 17 00:00:00 2001 -From: "Steven Rostedt (Google)" -Date: Thu, 22 Feb 2024 11:02:46 -0500 -Subject: libtracefs utest: Add PATH_MAX if it is not already defined - -In some setups PATH_MAX may not be defined (it is usually defined in -linux/limits.h), but we just use PATH_MAX as something to hold the paths -to the tracing files. In that case, just define it to 1024 if it's not -already defined. - -Link: https://lore.kernel.org/linux-trace-devel/20240222-utest-fixes-v2-1-7b8ee8dca0b7@gmail.com/ - -Fixes: 845f16976929 ("libtracefs: Add unit tests") -Reported-by: Miko Larsson -Signed-off-by: Steven Rostedt (Google) - -Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=ba750812f68f0f3314494558496c23f934f8faff -Signed-off-by: Fabrice Fontaine ---- - utest/tracefs-utest.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c -index 963fac7..07ecd32 100644 ---- a/utest/tracefs-utest.c -+++ b/utest/tracefs-utest.c -@@ -26,6 +26,10 @@ - - #define gettid() syscall(__NR_gettid) - -+#ifndef PATH_MAX -+#define PATH_MAX 1024 -+#endif -+ - #define TRACEFS_SUITE "tracefs library" - #define TEST_INSTANCE_NAME "cunit_test_iter" - #define TEST_TRACE_DIR "/tmp/trace_utest.XXXXXX" --- -cgit 1.2.3-korg - diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash index ebc562eb40..e728e6431f 100644 --- a/package/libtracefs/libtracefs.hash +++ b/package/libtracefs/libtracefs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0 libtracefs-1.8.0.tar.gz +sha256 d295aa20d711c313a9e229dbd15ba14026f0c1a50d57ae8b0823cc561b23745f libtracefs-1.8.1.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index ed45fcbc50..86baa5d9cd 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEFS_VERSION = 1.8.0 +LIBTRACEFS_VERSION = 1.8.1 LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot LIBTRACEFS_INSTALL_STAGING = YES LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1