From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] trace-cmd: update to 3.1.2, add new dependencies, split kernelshark
Date: Thu, 24 Nov 2022 21:08:46 +0100 [thread overview]
Message-ID: <20221124200846.sMuuEBxYZuvWSOcYvziokwza0uQMi5eDqKPpINuotiA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38851@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/trace-cmd-3.1.2
https://github.com/void-linux/void-packages/pull/38851
trace-cmd: update to 3.1.2, add new dependencies, split kernelshark
- New package: libtraceevent-1.6.2
- New package: libtracefs-1.4.2
- trace-cmd: update to 3.1.2.
- kernelshark: split from trace-cmd, update to 2.1.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly** (builds & runs, but I'm not sure how to use this so I can't test further)
A patch file from https://github.com/void-linux/void-packages/pull/38851.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/trace-cmd-3.1.2-38851.patch --]
[-- Type: text/x-diff, Size: 21706 bytes --]
From c079bedc7c7f7622f081b63dc855f7e1acc82878 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 21:37:06 -0400
Subject: [PATCH 1/4] New package: libtraceevent-1.6.3
---
common/shlibs | 1 +
srcpkgs/libtraceevent-devel | 1 +
srcpkgs/libtraceevent/template | 35 ++++++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+)
create mode 120000 srcpkgs/libtraceevent-devel
create mode 100644 srcpkgs/libtraceevent/template
diff --git a/common/shlibs b/common/shlibs
index 61f21bc3b94e..f51bb7749dda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,3 +4202,4 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
+libtraceevent.so.1 libtraceevent-1.6.2_1
diff --git a/srcpkgs/libtraceevent-devel b/srcpkgs/libtraceevent-devel
new file mode 120000
index 000000000000..9ca91c55529f
--- /dev/null
+++ b/srcpkgs/libtraceevent-devel
@@ -0,0 +1 @@
+libtraceevent
\ No newline at end of file
diff --git a/srcpkgs/libtraceevent/template b/srcpkgs/libtraceevent/template
new file mode 100644
index 000000000000..62446037c09b
--- /dev/null
+++ b/srcpkgs/libtraceevent/template
@@ -0,0 +1,35 @@
+# Template file for 'libtraceevent'
+pkgname=libtraceevent
+version=1.6.3
+revision=1
+build_style=gnu-makefile
+make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}"
+make_build_target="all doc"
+make_install_args="$make_build_args pkgconfig_dir=/usr/lib/pkgconfig"
+make_install_target="install doc-install"
+hostmakedepends="asciidoc xmlto source-highlight pkg-config"
+checkdepends="CUnit-devel"
+short_desc="Linux kernel trace event library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-only"
+homepage="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+distfiles="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-${version}.tar.gz"
+checksum=031e4428586788bb835d894f7f11c54e482764063d96ead303c7f208fb59e353
+
+do_check() {
+ make ${makejobs} test
+ utest/trace-utest
+}
+
+libtraceevent-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/doc
+ }
+}
From edaf1c0b3435bf365ab1621106ce3778b36ff10d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 21:41:02 -0400
Subject: [PATCH 2/4] New package: libtracefs-1.6.1
---
common/shlibs | 1 +
srcpkgs/libtracefs-devel | 1 +
.../libtracefs/patches/musl-limits_h.patch | 10 +++++
srcpkgs/libtracefs/patches/musl.patch | 17 ++++++++
srcpkgs/libtracefs/template | 42 +++++++++++++++++++
5 files changed, 71 insertions(+)
create mode 120000 srcpkgs/libtracefs-devel
create mode 100644 srcpkgs/libtracefs/patches/musl-limits_h.patch
create mode 100644 srcpkgs/libtracefs/patches/musl.patch
create mode 100644 srcpkgs/libtracefs/template
diff --git a/common/shlibs b/common/shlibs
index f51bb7749dda..332e24e45a5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4203,3 +4203,4 @@ libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libtraceevent.so.1 libtraceevent-1.6.2_1
+libtracefs.so.1 libtracefs-1.4.2_1
diff --git a/srcpkgs/libtracefs-devel b/srcpkgs/libtracefs-devel
new file mode 120000
index 000000000000..23466cce7993
--- /dev/null
+++ b/srcpkgs/libtracefs-devel
@@ -0,0 +1 @@
+libtracefs
\ No newline at end of file
diff --git a/srcpkgs/libtracefs/patches/musl-limits_h.patch b/srcpkgs/libtracefs/patches/musl-limits_h.patch
new file mode 100644
index 000000000000..e0cd38d5a7d8
--- /dev/null
+++ b/srcpkgs/libtracefs/patches/musl-limits_h.patch
@@ -0,0 +1,10 @@
+--- a/utest/tracefs-utest.c
++++ b/utest/tracefs-utest.c
+@@ -11,6 +11,7 @@
+ #include <libgen.h>
+ #include <kbuffer.h>
+ #include <pthread.h>
++#include <limits.h>
+
+ #include <CUnit/CUnit.h>
+ #include <CUnit/Basic.h>
diff --git a/srcpkgs/libtracefs/patches/musl.patch b/srcpkgs/libtracefs/patches/musl.patch
new file mode 100644
index 000000000000..50ba010fe210
--- /dev/null
+++ b/srcpkgs/libtracefs/patches/musl.patch
@@ -0,0 +1,17 @@
+--- a/include/tracefs.h
++++ b/include/tracefs.h
+@@ -10,6 +10,14 @@
+ #include <sched.h>
+ #include <event-parse.h>
+
++#ifndef _GNU_SOURCE
++#if !__GLIBC__
++/* See CPU_SET(3) */
++struct cpu_set_t;
++typedef struct cpu_set_t cpu_set_t;
++#endif
++#endif
++
+ char *tracefs_get_tracing_file(const char *name);
+ void tracefs_put_tracing_file(char *name);
+
diff --git a/srcpkgs/libtracefs/template b/srcpkgs/libtracefs/template
new file mode 100644
index 000000000000..f7c1cb68f62f
--- /dev/null
+++ b/srcpkgs/libtracefs/template
@@ -0,0 +1,42 @@
+# Template file for 'libtracefs'
+pkgname=libtracefs
+version=1.6.1
+revision=1
+build_style=gnu-makefile
+make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}"
+make_build_target="all doc"
+make_install_args="$make_build_args pkgconfig_dir=/usr/lib/pkgconfig"
+make_install_target="install install_doc"
+make_use_env=yes
+hostmakedepends="asciidoc xmlto source-highlight pkg-config"
+makedepends="libtraceevent-devel"
+checkdepends="CUnit-devel"
+short_desc="Linux kernel trace file system library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-only"
+homepage="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+distfiles="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-${version}.tar.gz"
+checksum=215a5182ee7d5a813ff84d290bb8988aa4c04cc16bb837780f61b0f5bf7494ab
+
+do_check() {
+ make ${makejobs} test
+ utest/trace-utest
+}
+
+post_install() {
+ # manpage for sample program
+ rm ${DESTDIR}/usr/share/man/man1/sqlhist.1
+}
+
+libtracefs-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/doc
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 62d94564272e0cbc9f79c1c579c237340cc961f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 23 Aug 2022 02:39:52 -0400
Subject: [PATCH 3/4] trace-cmd: update to 3.1.4.
---
common/shlibs | 1 +
srcpkgs/{kernelshark => libtracecmd} | 0
srcpkgs/libtracecmd-devel | 1 +
.../trace-cmd/patches/fix-program-name.patch | 23 --------
srcpkgs/trace-cmd/patches/glut.patch | 12 ----
srcpkgs/trace-cmd/patches/musl-limits_h.patch | 44 +++++++++------
.../musl-no_pthread_attr_setaffinity_np.patch | 24 --------
.../trace-cmd/patches/musl-pthread_h.patch | 10 ----
srcpkgs/trace-cmd/patches/no-rpath.patch | 20 +++++++
srcpkgs/trace-cmd/template | 56 +++++++++++--------
10 files changed, 83 insertions(+), 108 deletions(-)
rename srcpkgs/{kernelshark => libtracecmd} (100%)
create mode 120000 srcpkgs/libtracecmd-devel
delete mode 100644 srcpkgs/trace-cmd/patches/fix-program-name.patch
delete mode 100644 srcpkgs/trace-cmd/patches/glut.patch
delete mode 100644 srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch
delete mode 100644 srcpkgs/trace-cmd/patches/musl-pthread_h.patch
create mode 100644 srcpkgs/trace-cmd/patches/no-rpath.patch
diff --git a/common/shlibs b/common/shlibs
index 332e24e45a5c..ddf961520ef5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4204,3 +4204,4 @@ libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
+libtracecmd.so.1 libtracecmd-3.1.2_1
diff --git a/srcpkgs/kernelshark b/srcpkgs/libtracecmd
similarity index 100%
rename from srcpkgs/kernelshark
rename to srcpkgs/libtracecmd
diff --git a/srcpkgs/libtracecmd-devel b/srcpkgs/libtracecmd-devel
new file mode 120000
index 000000000000..77b3407d0913
--- /dev/null
+++ b/srcpkgs/libtracecmd-devel
@@ -0,0 +1 @@
+trace-cmd
\ No newline at end of file
diff --git a/srcpkgs/trace-cmd/patches/fix-program-name.patch b/srcpkgs/trace-cmd/patches/fix-program-name.patch
deleted file mode 100644
index 970122246115..000000000000
--- a/srcpkgs/trace-cmd/patches/fix-program-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/kernel-shark/src/kernelshark.cpp 2019-07-05 18:23:00.000000000 +0200
-+++ b/kernel-shark/src/kernelshark.cpp 2019-07-08 17:52:19.081010524 +0200
-@@ -35,6 +35,11 @@
- {
- QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- QApplication a(argc, argv);
-+ const char* program_name = strrchr(argv[0], '/');
-+ if (nullptr == program_name)
-+ program_name = argv[0];
-+ else
-+ ++program_name;
-
- KsMainWindow ks;
-
-@@ -48,7 +51,7 @@
- return 0;
-
- case 'v':
-- printf("%s - %s\n", basename(argv[0]), KS_VERSION_STRING);
-+ printf("%s - %s\n", program_name, KS_VERSION_STRING);
- return 0;
-
- case 'i':
diff --git a/srcpkgs/trace-cmd/patches/glut.patch b/srcpkgs/trace-cmd/patches/glut.patch
deleted file mode 100644
index 5db232a21b38..000000000000
--- a/srcpkgs/trace-cmd/patches/glut.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trace-cmd-2.9.1/kernel-shark/CMakeLists.txt
-===================================================================
---- trace-cmd-2.9.1.orig/kernel-shark/CMakeLists.txt
-+++ trace-cmd-2.9.1/kernel-shark/CMakeLists.txt
-@@ -29,6 +29,7 @@ find_package(Doxygen)
- set(OpenGL_GL_PREFERENCE LEGACY)
- find_package(OpenGL)
- find_package(GLUT)
-+link_libraries(${GLUT_LIBRARIES})
-
- find_package(Qt5Widgets 5.7.1)
- find_package(Qt5Network)
diff --git a/srcpkgs/trace-cmd/patches/musl-limits_h.patch b/srcpkgs/trace-cmd/patches/musl-limits_h.patch
index 83e278c8ab9e..af90e89b8d75 100644
--- a/srcpkgs/trace-cmd/patches/musl-limits_h.patch
+++ b/srcpkgs/trace-cmd/patches/musl-limits_h.patch
@@ -1,15 +1,5 @@
---- a/include/tracefs/tracefs.h 2020-07-17 17:14:20.000000000 +0200
-+++ b/include/tracefs/tracefs.h 2020-07-18 16:27:27.559697340 +0200
-@@ -6,6 +6,7 @@
- #ifndef _TRACE_FS_H
- #define _TRACE_FS_H
-
-+#include <limits.h>
- #include "traceevent/event-parse.h"
-
- char *tracefs_get_tracing_file(const char *name);
---- a/lib/trace-cmd/trace-plugin.c 2020-07-17 17:14:20.000000000 +0200
-+++ b/lib/trace-cmd/trace-plugin.c 2020-07-18 16:33:40.323675122 +0200
+--- a/lib/trace-cmd/trace-plugin.c
++++ b/lib/trace-cmd/trace-plugin.c
@@ -6,6 +6,7 @@
#include <stdlib.h>
#include <unistd.h>
@@ -18,18 +8,18 @@
#include <sys/stat.h>
#include <libgen.h>
#include "trace-cmd.h"
---- a/tracecmd/trace-agent.c 2020-07-17 17:14:20.000000000 +0200
-+++ b/tracecmd/trace-agent.c 2020-07-18 16:35:53.882667161 +0200
+--- a/tracecmd/trace-agent.c
++++ b/tracecmd/trace-agent.c
@@ -14,6 +14,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <limits.h>
- #include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/wait.h>
---- a/tracecmd/trace-setup-guest.c 2020-07-17 17:14:20.000000000 +0200
-+++ b/tracecmd/trace-setup-guest.c 2020-07-18 16:37:29.463661464 +0200
+ #include <unistd.h>
+--- a/tracecmd/trace-setup-guest.c
++++ b/tracecmd/trace-setup-guest.c
@@ -13,6 +13,7 @@
#include <string.h>
#include <sys/stat.h>
@@ -38,3 +28,23 @@
#include "trace-local.h"
#include "trace-msg.h"
+--- a/lib/trace-cmd/trace-timesync-kvm.c
++++ b/lib/trace-cmd/trace-timesync-kvm.c
+@@ -10,6 +10,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <ctype.h>
++#include <limits.h>
+
+ #include "trace-cmd.h"
+ #include "trace-cmd-private.h"
+--- a/utest/tracecmd-utest.c
++++ b/utest/tracecmd-utest.c
+@@ -13,6 +13,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <limits.h>
+
+ #include <CUnit/CUnit.h>
+ #include <CUnit/Basic.h>
diff --git a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch b/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch
deleted file mode 100644
index 5203d3335c2b..000000000000
--- a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tracecmd/trace-tsync.c 2020-07-17 17:14:20.000000000 +0200
-+++ b/tracecmd/trace-tsync.c 2020-07-18 16:41:53.175645746 +0200
-@@ -104,8 +104,10 @@
-
- pthread_attr_init(&attrib);
- pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE);
-+#if defined(__GLIBC__)
- if (!get_first_cpu(&pin_mask, &mask_size))
- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask);
-+#endif
-
- ret = pthread_create(&instance->tsync_thread, &attrib,
- tsync_host_thread, &instance->tsync);
-@@ -243,8 +245,10 @@
- pthread_attr_init(&attrib);
- tsync->sync_proto = proto;
- pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE);
-+#if defined(__GLIBC__)
- if (!get_first_cpu(&pin_mask, &mask_size))
- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask);
-+#endif
-
- ret = pthread_create(thr_id, &attrib, tsync_agent_thread, tsync);
-
diff --git a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch b/srcpkgs/trace-cmd/patches/musl-pthread_h.patch
deleted file mode 100644
index 367588391845..000000000000
--- a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/trace-cmd/trace-cmd.h 2020-07-17 17:14:20.000000000 +0200
-+++ b/include/trace-cmd/trace-cmd.h 2020-07-18 16:23:27.984711620 +0200
-@@ -6,6 +6,7 @@
- #ifndef _TRACE_CMD_H
- #define _TRACE_CMD_H
-
-+#include <pthread.h>
- #include "traceevent/event-parse.h"
-
- #define TRACECMD_MAGIC { 23, 8, 68 }
diff --git a/srcpkgs/trace-cmd/patches/no-rpath.patch b/srcpkgs/trace-cmd/patches/no-rpath.patch
new file mode 100644
index 000000000000..ff2fd9fe864e
--- /dev/null
+++ b/srcpkgs/trace-cmd/patches/no-rpath.patch
@@ -0,0 +1,20 @@
+--- a/scripts/utils.mk
++++ b/scripts/utils.mk
+@@ -64,7 +64,7 @@
+
+ do_app_build = \
+ ($(print_app_build) \
+- $(CC) $^ -rdynamic -Wl,-rpath=$(libdir) -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
++ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
+
+ do_build_static_lib = \
+ ($(print_static_lib_build) \
+@@ -72,7 +72,7 @@
+
+ do_compile_shared_library = \
+ ($(print_shared_lib_compile) \
+- $(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS))
++ $(CC) --shared $^ '-Wl,-soname,$(1)' -o $@ $(LDFLAGS) $(LIBS))
+
+ do_compile_plugin_obj = \
+ ($(print_plugin_obj_compile) \
diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template
index ecef9dad32e4..055b59dfb7cf 100644
--- a/srcpkgs/trace-cmd/template
+++ b/srcpkgs/trace-cmd/template
@@ -1,36 +1,48 @@
# Template file for 'trace-cmd'
pkgname=trace-cmd
-version=2.9.1
+version=3.1.4
revision=1
build_style=gnu-makefile
-make_build_args="prefix=/usr all gui doc"
-make_install_args="prefix=/usr install install_gui install_doc"
-make_use_env=1
-hostmakedepends="git asciidoc pkg-config cmake qt5-qmake qt5-host-tools"
-makedepends="json-c-devel libfreeglut-devel libxml2-devel qt5-devel"
+make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}"
+make_build_target="all libs doc"
+make_install_args="$make_build_args pkgconfig_dir=/usr/lib/pkgconfig"
+make_install_target="install install_libs install_doc"
+make_use_env=yes
+hostmakedepends="asciidoc xmlto source-highlight pkg-config"
+makedepends="libzstd-devel libtracefs-devel libtraceevent-devel"
+checkdepends="CUnit-devel"
short_desc="Tools to use ftrace Linux kernel internal tracer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
-homepage="http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/"
-distfiles="http://git.kernel.org/cgit/linux/kernel/git/rostedt/${pkgname}.git/snapshot/${pkgname}-v${version}.tar.gz"
-checksum=9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38
-disable_parallel_build=yes
+homepage="https://trace-cmd.org"
+distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"
+checksum=447e095dbdfb0d362ab8c2086d62d80c5a2ecf67aef09b8f6b0cc064c0e1bfb5
+
+do_check() {
+ make ${makejobs} test
+ utest/trace-utest
+}
post_install() {
- vmkdir usr/share/bash-completion/completions
- mv ${DESTDIR}/usr/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
+ rm ${DESTDIR}/etc/bash_completion.d/*
+ vcompletion tracecmd/trace-cmd.bash bash
+}
+
+libtracecmd_package() {
+ short_desc+=" - library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
}
-kernelshark_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="GUI for ftrace Linux kernel internal tracer"
+libtracecmd-devel_package() {
+ depends="libtracecmd>=${version}_${revision} ${makedepends}"
+ short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/kernelshark
- vmove usr/bin/kshark-record
- vmove usr/bin/kshark-su-record
- vmove usr/lib/kernelshark
- vmove usr/share/applications/kernelshark.desktop
- vmove usr/share/icons/kernelshark
- vmove usr/share/polkit-1/actions/org.freedesktop.kshark-record.policy
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove usr/share/doc/libtracecmd-doc
}
}
From f590090b885fe8d83a3850fa9e0883562b9ef21a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 23 Aug 2022 03:07:55 -0400
Subject: [PATCH 4/4] kernelshark: split from trace-cmd, update to 2.1.1
---
common/shlibs | 1 +
srcpkgs/kernelshark/patches/musl.patch | 20 +++++++++++++
srcpkgs/kernelshark/template | 40 ++++++++++++++++++++++++++
srcpkgs/kernelshark/update | 1 +
srcpkgs/libkshark | 1 +
srcpkgs/libkshark-devel | 1 +
6 files changed, 64 insertions(+)
create mode 100644 srcpkgs/kernelshark/patches/musl.patch
create mode 100644 srcpkgs/kernelshark/template
create mode 100644 srcpkgs/kernelshark/update
create mode 120000 srcpkgs/libkshark
create mode 120000 srcpkgs/libkshark-devel
diff --git a/common/shlibs b/common/shlibs
index ddf961520ef5..5ca12d1a391f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4205,3 +4205,4 @@ libairspyhf.so.0 libairspyhf-1.6.8_1
libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
+libkshark.so.2 libkshark-2.1.1_1
diff --git a/srcpkgs/kernelshark/patches/musl.patch b/srcpkgs/kernelshark/patches/musl.patch
new file mode 100644
index 000000000000..e02fddb486c7
--- /dev/null
+++ b/srcpkgs/kernelshark/patches/musl.patch
@@ -0,0 +1,20 @@
+--- a/src/libkshark.h
++++ b/src/libkshark.h
+@@ -17,6 +17,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ #include <errno.h>
++#include <sys/types.h>
+
+ // Json-C
+ #include <json-c/json.h>
+--- a/src/kernelshark.cpp
++++ b/src/kernelshark.cpp
+@@ -7,6 +7,7 @@
+ // C
+ #include <sys/stat.h>
+ #include <getopt.h>
++#include <libgen.h>
+
+ // Qt
+ #include <QApplication>
diff --git a/srcpkgs/kernelshark/template b/srcpkgs/kernelshark/template
new file mode 100644
index 000000000000..91ebad4dea7c
--- /dev/null
+++ b/srcpkgs/kernelshark/template
@@ -0,0 +1,40 @@
+# Template file for 'kernelshark'
+pkgname=kernelshark
+reverts="2.9.1_1 2.9_1 2.8.3_2 2.8.3_1 2.8.2_1 2.8.1_1 2.7_2 2.7_1 2.6.2_1 2.6.1_1
+ 2.6_1 2.5.3_3 2.5.3_2 2.5.3_1 2.5.1_1 2.5_1 2.4_1"
+version=2.1.1
+revision=1
+build_style=cmake
+# It's PKG_CONGIG_DIR not PKG_CONFIG_DIR
+configure_args="-D_INSTALL_PREFIX=/usr -D_LIBDIR=/usr/lib$XBPS_TARGET_WORDSIZE
+ -DPKG_CONGIG_DIR=/usr/lib/pkgconfig -DTT_FONT_FILE=/usr/share/fonts/TTF/FreeSans.ttf
+ -DTRACECMD_EXECUTABLE=/usr/bin/trace-cmd -DCMAKE_SKIP_RPATH=ON"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
+makedepends="libfreeglut-devel qt5-devel json-c-devel libXmu-devel libXi-devel
+ libtraceevent-devel libtracefs-devel libtracecmd-devel"
+depends="freefont-ttf trace-cmd"
+short_desc="Front end reader of trace-cmd(1) output"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.kernelshark.org"
+distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernel-shark-kernelshark-v${version}.tar.gz"
+checksum=78a0cf28bc06d0e43cd5a2512f83c02b7b5c969a26a0d4b56338154d6cf6f7be
+# requires externally-downloaded data and segfaults on some gui tests
+make_check=no
+
+libkshark_package() {
+ short_desc+=" - library"
+ pkg_install() {
+ vmove "usr/lib/libkshark.so.*"
+ }
+}
+
+libkshark-devel_package() {
+ depends="libkshark>=${version}_${revision} ${makedepends}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/kernelshark/update b/srcpkgs/kernelshark/update
new file mode 100644
index 000000000000..8b5f28fc01ca
--- /dev/null
+++ b/srcpkgs/kernelshark/update
@@ -0,0 +1 @@
+pkgname=kernel-shark-kernelshark
diff --git a/srcpkgs/libkshark b/srcpkgs/libkshark
new file mode 120000
index 000000000000..5e1b3a665844
--- /dev/null
+++ b/srcpkgs/libkshark
@@ -0,0 +1 @@
+kernelshark
\ No newline at end of file
diff --git a/srcpkgs/libkshark-devel b/srcpkgs/libkshark-devel
new file mode 120000
index 000000000000..5e1b3a665844
--- /dev/null
+++ b/srcpkgs/libkshark-devel
@@ -0,0 +1 @@
+kernelshark
\ No newline at end of file
next prev parent reply other threads:[~2022-11-24 20:08 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 7:59 [PR PATCH] " classabbyamp
2022-08-23 8:14 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 8:22 ` classabbyamp
2022-08-23 8:28 ` classabbyamp
2022-08-23 8:31 ` classabbyamp
2022-08-23 8:47 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 8:54 ` classabbyamp
2022-08-23 8:56 ` classabbyamp
2022-08-23 8:57 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 9:11 ` classabbyamp
2022-08-23 9:13 ` classabbyamp
2022-08-23 14:37 ` sgn
2022-08-23 14:38 ` [PR REVIEW] " sgn
2022-08-23 14:39 ` sgn
2022-08-23 16:00 ` [PR PATCH] [Updated] " sgn
2022-08-23 16:16 ` sgn
2022-08-23 16:18 ` sgn
2022-08-23 16:19 ` sgn
2022-08-23 17:53 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 17:57 ` classabbyamp
2022-08-23 18:22 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 19:25 ` classabbyamp
2022-08-23 19:25 ` classabbyamp
2022-08-23 19:25 ` classabbyamp
2022-08-23 19:26 ` classabbyamp
2022-08-23 19:26 ` classabbyamp
2022-08-23 20:40 ` [PR PATCH] [Updated] " classabbyamp
2022-08-23 21:15 ` classabbyamp
2022-08-23 21:27 ` classabbyamp
2022-08-23 22:25 ` [PR PATCH] [Updated] " classabbyamp
2022-08-24 0:19 ` [PR REVIEW] " sgn
2022-08-24 0:20 ` classabbyamp
2022-08-24 0:22 ` [PR PATCH] [Updated] " classabbyamp
2022-08-24 0:23 ` [PR REVIEW] " sgn
2022-08-24 0:27 ` classabbyamp
2022-08-24 19:22 ` classabbyamp
2022-08-24 19:22 ` classabbyamp
2022-08-24 19:25 ` [PR PATCH] [Updated] " classabbyamp
2022-08-25 0:57 ` [PR REVIEW] " sgn
2022-08-25 0:59 ` sgn
2022-08-25 0:59 ` sgn
2022-08-25 1:00 ` sgn
2022-08-25 1:43 ` [PR PATCH] [Updated] " classabbyamp
2022-08-25 1:55 ` [PR REVIEW] " classabbyamp
2022-11-23 2:06 ` github-actions
2022-11-24 8:16 ` [PR PATCH] [Updated] " classabbyamp
2022-11-24 8:26 ` classabbyamp
2022-11-24 8:38 ` classabbyamp
2022-11-24 10:49 ` classabbyamp
2022-11-24 19:54 ` classabbyamp
2022-11-24 20:08 ` classabbyamp [this message]
2022-11-24 20:10 ` classabbyamp
2022-11-25 5:38 ` classabbyamp
2022-11-25 18:41 ` leahneukirchen
2022-11-26 0:35 ` classabbyamp
2022-11-26 0:35 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221124200846.sMuuEBxYZuvWSOcYvziokwza0uQMi5eDqKPpINuotiA@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).