AOSC-Dev · MingcongBai · Sep 22, 2024 · Sep 14, 2024 · Sep 20, 2024 · Sep 14, 2024
diff --git a/app-utils/trace-cmd/autobuild/build b/app-utils/trace-cmd/autobuild/build
@@ -3,4 +3,5 @@ make PYTHON_VERS=python3 lib trace-cmd doc
 
 abinfo "Installing binaries ..."
 make install install_doc \
-    PYTHON_VERS=python3 $MAKE_INSTALL_DEF DESTDIR="$PKGDIR"
+    PYTHON_VERS=python3 {$MAKE_INSTALL_DEF[@]} \
+    libdir_relative_temp=lib prefix=/usr DESTDIR="$PKGDIR"
diff --git a/app-utils/trace-cmd/autobuild/defines b/app-utils/trace-cmd/autobuild/defines
@@ -1,5 +1,5 @@
 PKGNAME=trace-cmd
 PKGSEC=utils
-PKGDEP="python-3 freeglut json-c"
+PKGDEP="python-3 freeglut json-c libtracefs"
 BUILDDEP="asciidoc docbook-xsl doxygen pygtk swig xmlto"
 PKGDES="User-space front-end command-line tool for Ftrace"
diff --git a/app-utils/trace-cmd/autobuild/patches/0001-trace-cmd-Fix-build-with-gcc-10.patch b/app-utils/trace-cmd/autobuild/patches/0001-trace-cmd-Fix-build-with-gcc-10.patch
diff --git a/app-utils/trace-cmd/autobuild/prepare b/app-utils/trace-cmd/autobuild/prepare
@@ -1,4 +1,4 @@
-abinfo "Fedora: Attaching `-z muldefs` to LDFLAGS ..."
+abinfo 'Fedora: Attaching `-z muldefs` to LDFLAGS ...'
 # Workaround the enforcing multi definition check of GCC 10/11,
 # and it need to be removed once upstream fixed the variable name.
 export LDFLAGS="$LDFLAGS -z muldefs"

diff --git a/app-utils/trace-cmd/spec b/app-utils/trace-cmd/spec
@@ -1,5 +1,4 @@
-VER=2.8.3
-REL=2
-SRCS="tbl::https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/snapshot/trace-cmd-v$VER.tar.gz"
-CHKSUMS="sha256::706564b147bd966957431c4ca70032947d59c5d977c1ac2942b1b5a8668e7a6f"
+VER=3.3
+SRCS="git::commit=tags/trace-cmd-v$VER::https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=7873"
diff --git a/runtime-admin/libtracefs/autobuild/build b/runtime-admin/libtracefs/autobuild/build
@@ -0,0 +1,6 @@
+abinfo "Building libtracefs ..."
+make all sqlhist
+
+abinfo "Install libtracefs ..."
+make libdir_relative=lib prefix=/usr DESTDIR="$PKGDIR" install
+install -Dvm 755 "$SRCDIR"/bin/sqlhist -t "$PKGDIR"/usr/bin/
diff --git a/runtime-admin/libtracefs/autobuild/patches/0001-install-documentation.patch b/runtime-admin/libtracefs/autobuild/patches/0001-install-documentation.patch
@@ -1,6 +1,18 @@
-diff -Naur libtracefs-1.6.4/Documentation/Makefile libtracefs-1.6.4.mod/Documentation/Makefile
---- libtracefs-1.6.4/Documentation/Makefile	2023-01-09 20:14:30.000000000 -0500
-+++ libtracefs-1.6.4.mod/Documentation/Makefile	2023-04-25 21:44:00.902801797 -0400
+From 4f4cbe5144433f57d84450312a9aa7a51601818a Mon Sep 17 00:00:00 2001
+From: salieri <[email protected]>
+Date: Sat, 14 Sep 2024 16:18:52 +0800
+Subject: [PATCH] install documentation
+
+---
+ Documentation/Makefile | 2 +-
+ Makefile               | 4 ++--
+ scripts/utils.mk       | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index afcb6a5..1aa3c98 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
 @@ -1,6 +1,6 @@
  # SPDX-License-Identifier: LGPL-2.1
 
@@ -9,19 +21,20 @@ diff -Naur libtracefs-1.6.4/Documentation/Makefile libtracefs-1.6.4.mod/Document
 
 
  # This Makefile and manpage XSL files were taken from libtraceevent
-diff -Naur libtracefs-1.6.4/Makefile libtracefs-1.6.4.mod/Makefile
---- libtracefs-1.6.4/Makefile	2023-04-25 21:47:12.720952552 -0400
-+++ libtracefs-1.6.4.mod/Makefile	2023-04-25 21:47:19.808881520 -0400
-@@ -167,7 +167,7 @@
- # Make sure 32 bit stat() works on large file systems
- override CFLAGS += -D_FILE_OFFSET_BITS=64
+diff --git a/Makefile b/Makefile
+index bd5c76b..6aa0e9f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -187,7 +187,7 @@ override CFLAGS += -D_FILE_OFFSET_BITS=64
+ export CFLAGS
+ export INCLUDES
 
 -all: all_cmd
 +all: all_cmd doc
 
  LIB_TARGET  = libtracefs.a libtracefs.so.$(TRACEFS_VERSION)
  LIB_INSTALL = libtracefs.a libtracefs.so*
-@@ -280,7 +280,7 @@
+@@ -300,7 +300,7 @@ install_libs: libs install_pkgconfig
  	$(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644)
  	$(Q)$(call install_ld_config)
 
@@ -30,10 +43,11 @@ diff -Naur libtracefs-1.6.4/Makefile libtracefs-1.6.4.mod/Makefile
 
  install_pkgconfig: $(PKG_CONFIG_FILE)
  	$(Q)$(call , $(PKG_CONFIG_FILE)) \
-diff -Naur libtracefs-1.6.4/scripts/utils.mk libtracefs-1.6.4.mod/scripts/utils.mk
---- libtracefs-1.6.4/scripts/utils.mk	2023-01-09 20:14:30.000000000 -0500
-+++ libtracefs-1.6.4.mod/scripts/utils.mk	2023-04-25 21:44:58.765260220 -0400
-@@ -101,11 +101,11 @@
+diff --git a/scripts/utils.mk b/scripts/utils.mk
+index 4d0f8bc..0175b38 100644
+--- a/scripts/utils.mk
++++ b/scripts/utils.mk
+@@ -101,11 +101,11 @@ extract_example =				\
 
  do_sample_build =							\
  	$(Q)($(print_sample_build)					\
@@ -47,3 +61,6 @@ diff -Naur libtracefs-1.6.4/scripts/utils.mk libtracefs-1.6.4.mod/scripts/utils.
 
  ifneq ($(findstring $(MAKEFLAGS), w),w)
  PRINT_DIR = --no-print-directory
+-- 
+2.34.1
+
diff --git a/runtime-admin/libtracefs/spec b/runtime-admin/libtracefs/spec
@@ -1,4 +1,4 @@
-VER=1.6.4
-SRCS="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-${VER}.tar.gz"
-CHKSUMS="sha256::52ce793dbb35a3e59bddce31de09a5d92cedd4d0702e64d0916f1ccdb00526c9"
+VER=1.8.1
+SRCS="git::commit=tags/libtracefs-$VER::https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=288157"
diff --git a/runtime-kernel/libtraceevent/spec b/runtime-kernel/libtraceevent/spec
@@ -1,3 +1,3 @@
-VER=1.7.1
+VER=1.8.1
 SRCS="tbl::https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-$VER.tar.gz"
-CHKSUMS="sha256::17b7131c106793c3b45477445bd32d295170c4245ed8348e03c17296e53009e1"
+CHKSUMS="sha256::1801f416b317e2ae0430ce964cf22b9ecb9fb5cd9c6c2d1073b29953c3309bca"