Merge pull request #350 from serpent-os/feat/perf-libtraceevent

perf: Build with libtraceevent support
serpent-os · Oct 21, 2024 · 3a5aaf3 · 3a5aaf3
2 parents d7a7f62 + 2af1c1a
commit 3a5aaf3
Show file tree

Hide file tree

Showing 9 changed files with 240 additions and 5 deletions.
diff --git a/c/cunit/manifest.x86_64.bin b/c/cunit/manifest.x86_64.bin
diff --git a/c/cunit/manifest.x86_64.jsonc b/c/cunit/manifest.x86_64.jsonc
@@ -0,0 +1,84 @@
+/** Human readable report. This is not consumed by boulder */
+{
+	"manifest-version": "0.2",
+	"packages": {
+		"cunit": {
+			"build-depends": [
+				"autoconf",
+				"automake"
+			],
+			"depends": [
+				"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
+				"soname(libc.so.6(x86_64))"
+			],
+			"files": [
+				"/usr/doc/CUnit/CUnit_doc.css",
+				"/usr/doc/CUnit/error_handling.html",
+				"/usr/doc/CUnit/fdl.html",
+				"/usr/doc/CUnit/headers/Automated.h",
+				"/usr/doc/CUnit/headers/Basic.h",
+				"/usr/doc/CUnit/headers/CUCurses.h",
+				"/usr/doc/CUnit/headers/CUError.h",
+				"/usr/doc/CUnit/headers/CUnit.h",
+				"/usr/doc/CUnit/headers/CUnit_intl.h",
+				"/usr/doc/CUnit/headers/Console.h",
+				"/usr/doc/CUnit/headers/MyMem.h",
+				"/usr/doc/CUnit/headers/TestDB.h",
+				"/usr/doc/CUnit/headers/TestRun.h",
+				"/usr/doc/CUnit/headers/Util.h",
+				"/usr/doc/CUnit/headers/Win.h",
+				"/usr/doc/CUnit/index.html",
+				"/usr/doc/CUnit/introduction.html",
+				"/usr/doc/CUnit/managing_tests.html",
+				"/usr/doc/CUnit/running_tests.html",
+				"/usr/doc/CUnit/test_registry.html",
+				"/usr/doc/CUnit/writing_tests.html",
+				"/usr/lib/libcunit.so.1",
+				"/usr/lib/libcunit.so.1.0.1",
+				"/usr/share/CUnit/CUnit-List.dtd",
+				"/usr/share/CUnit/CUnit-List.xsl",
+				"/usr/share/CUnit/CUnit-Run.dtd",
+				"/usr/share/CUnit/CUnit-Run.xsl",
+				"/usr/share/CUnit/Memory-Dump.dtd",
+				"/usr/share/CUnit/Memory-Dump.xsl",
+				"/usr/share/CUnit/Test/test_cunit"
+			],
+			"name": "cunit",
+			"provides": [
+				"soname(libcunit.so.1(x86_64))"
+			]
+		},
+		"cunit-devel": {
+			"build-depends": [
+				"autoconf",
+				"automake"
+			],
+			"depends": [
+				"cunit"
+			],
+			"files": [
+				"/usr/include/CUnit/Automated.h",
+				"/usr/include/CUnit/Basic.h",
+				"/usr/include/CUnit/CUError.h",
+				"/usr/include/CUnit/CUnit.h",
+				"/usr/include/CUnit/CUnit_intl.h",
+				"/usr/include/CUnit/Console.h",
+				"/usr/include/CUnit/MyMem.h",
+				"/usr/include/CUnit/TestDB.h",
+				"/usr/include/CUnit/TestRun.h",
+				"/usr/include/CUnit/Util.h",
+				"/usr/lib/libcunit.a",
+				"/usr/lib/libcunit.so",
+				"/usr/lib/pkgconfig/cunit.pc",
+				"/usr/share/man/man3/CUnit.3"
+			],
+			"name": "cunit-devel",
+			"provides": [
+				"pkgconfig(cunit)"
+			]
+		}
+	},
+	"source-name": "cunit",
+	"source-release": "1",
+	"source-version": "2.1.3"
+}
diff --git a/c/cunit/stone.yaml b/c/cunit/stone.yaml
@@ -0,0 +1,39 @@
+#
+# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
+#
+# SPDX-License-Identifier: MPL-2.0
+#                
+name        : cunit
+version     : 2.1.3
+release     : 1
+homepage    : https://cunit.sourceforge.net
+upstreams   :
+    - https://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2 : f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+    # https://downloads.sourceforge.net/project/cunit/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.bz2
+summary     : CUnit is a Unit testing framework for C
+description : |
+    CUnit is a lightweight system for writing, administering, and running unit tests in C.  It provides C programmers a basic testing functionality with a flexible variety of user interfaces.
+license     : GPL-2.0
+builddeps   :
+    - autoconf
+    - automake
+setup       : |
+    # "heavily inspired" by the Arch Linux PKGBUILD source
+    libtoolize --force --copy
+    aclocal
+    autoheader
+    automake --add-missing --include-deps --copy
+    autoconf
+
+    %configure \
+        --enable-automated \
+        --enable-basic \
+        --enable-console \
+        --enable-test \
+        --enable-shared \
+        --enable-static
+build       : |
+    %make
+install     : |
+    %make_install
+
diff --git a/l/libtraceevent/manifest.x86_64.bin b/l/libtraceevent/manifest.x86_64.bin
diff --git a/l/libtraceevent/manifest.x86_64.jsonc b/l/libtraceevent/manifest.x86_64.jsonc
@@ -0,0 +1,76 @@
+/** Human readable report. This is not consumed by boulder */
+{
+	"manifest-version": "0.2",
+	"packages": {
+		"libtraceevent": {
+			"build-depends": [
+				"binary(readelf)",
+				"cunit",
+				"cunit-devel"
+			],
+			"depends": [
+				"cunit",
+				"soname(libc.so.6(x86_64))"
+			],
+			"files": [
+				"/usr/lib/libtraceevent.so.1",
+				"/usr/lib/libtraceevent.so.1.8.3",
+				"/usr/lib/traceevent/plugins/libtraceevent-dynamic-list",
+				"/usr/lib/traceevent/plugins/plugin_cfg80211.so",
+				"/usr/lib/traceevent/plugins/plugin_function.so",
+				"/usr/lib/traceevent/plugins/plugin_futex.so",
+				"/usr/lib/traceevent/plugins/plugin_hrtimer.so",
+				"/usr/lib/traceevent/plugins/plugin_jbd2.so",
+				"/usr/lib/traceevent/plugins/plugin_kmem.so",
+				"/usr/lib/traceevent/plugins/plugin_kvm.so",
+				"/usr/lib/traceevent/plugins/plugin_mac80211.so",
+				"/usr/lib/traceevent/plugins/plugin_sched_switch.so",
+				"/usr/lib/traceevent/plugins/plugin_scsi.so",
+				"/usr/lib/traceevent/plugins/plugin_tlb.so",
+				"/usr/lib/traceevent/plugins/plugin_xen.so"
+			],
+			"name": "libtraceevent",
+			"provides": [
+				"soname(libtraceevent.so.1(x86_64))",
+				"soname(plugin_cfg80211.so(x86_64))",
+				"soname(plugin_function.so(x86_64))",
+				"soname(plugin_futex.so(x86_64))",
+				"soname(plugin_hrtimer.so(x86_64))",
+				"soname(plugin_jbd2.so(x86_64))",
+				"soname(plugin_kmem.so(x86_64))",
+				"soname(plugin_kvm.so(x86_64))",
+				"soname(plugin_mac80211.so(x86_64))",
+				"soname(plugin_sched_switch.so(x86_64))",
+				"soname(plugin_scsi.so(x86_64))",
+				"soname(plugin_tlb.so(x86_64))",
+				"soname(plugin_xen.so(x86_64))"
+			]
+		},
+		"libtraceevent-devel": {
+			"build-depends": [
+				"binary(readelf)",
+				"cunit",
+				"cunit-devel"
+			],
+			"depends": [
+				"libtraceevent"
+			],
+			"files": [
+				"/usr/include/traceevent/event-parse.h",
+				"/usr/include/traceevent/event-utils.h",
+				"/usr/include/traceevent/kbuffer.h",
+				"/usr/include/traceevent/trace-seq.h",
+				"/usr/lib/libtraceevent.a",
+				"/usr/lib/libtraceevent.so",
+				"/usr/lib/pkgconfig/libtraceevent.pc"
+			],
+			"name": "libtraceevent-devel",
+			"provides": [
+				"pkgconfig(libtraceevent)"
+			]
+		}
+	},
+	"source-name": "libtraceevent",
+	"source-release": "1",
+	"source-version": "1.8.3"
+}
diff --git a/l/libtraceevent/stone.yaml b/l/libtraceevent/stone.yaml
@@ -0,0 +1,32 @@
+#
+# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
+#
+# SPDX-License-Identifier: MPL-2.0
+#                
+name        : libtraceevent
+version     : 1.8.3
+release     : 1
+homepage    : https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/about/
+upstreams   :
+    - https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.8.3.tar.gz : 233d88adf5bae6b4511980f0f6314f348326b55fdb3dc9c4212c810e1ab06789
+summary     : Linux kernel trace event library
+description : |
+    The libtraceevent(3) library provides APIs to access kernel tracepoint events, located in the tracefs file system under the events directory.
+license     :
+    - GPL-2.0
+    - LGPL-2.1
+builddeps   :
+    - binary(readelf)
+    - cunit
+    - cunit-devel
+rundeps     :
+    - cunit
+setup       : |
+    # TODO: enable docs once we have a decent AsciiDoc story
+    %meson -Ddoc=false
+build       : |
+    %meson_build
+install     : |
+    %meson_install
+check       : |
+    %meson_test
diff --git a/p/perf/manifest.x86_64.bin b/p/perf/manifest.x86_64.bin
diff --git a/p/perf/manifest.x86_64.jsonc b/p/perf/manifest.x86_64.jsonc
@@ -10,12 +10,14 @@
 				"pkgconfig(libcap)",
 				"pkgconfig(libelf)",
 				"pkgconfig(liblzma)",
+				"pkgconfig(libtraceevent)",
 				"pkgconfig(libzstd)",
 				"pkgconfig(python3)",
 				"pkgconfig(zlib)"
 			],
 			"depends": [
 				"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
+				"soname(ld-linux-x86-64.so.2(x86_64))",
 				"soname(libc++.so.1(x86_64))",
 				"soname(libc.so.6(x86_64))",
 				"soname(libcap.so.2(x86_64))",
@@ -24,7 +26,9 @@
 				"soname(libelf.so.1(x86_64))",
 				"soname(liblzma.so.5(x86_64))",
 				"soname(libm.so.6(x86_64))",
+				"soname(libperl.so(x86_64))",
 				"soname(libpython3.11.so.1.0(x86_64))",
+				"soname(libtraceevent.so.1(x86_64))",
 				"soname(libz.so.1(x86_64))",
 				"soname(libzstd.so.1(x86_64))"
 			],
@@ -254,6 +258,6 @@
 		}
 	},
 	"source-name": "perf",
-	"source-release": "10",
+	"source-release": "11",
 	"source-version": "6.10.0"
 }
diff --git a/p/perf/stone.yaml b/p/perf/stone.yaml
@@ -5,7 +5,7 @@
 #
 name        : perf
 version     : "6.10.0"
-release     : 10
+release     : 11
 summary     : Linux profiling with performance counters
 license     : GPL-2.0-only
 homepage    : https://perf.wiki.kernel.org/
@@ -18,6 +18,7 @@ builddeps   :
     - binary(flex)
     - pkgconfig(libcap)
     - pkgconfig(libelf)
+    - pkgconfig(libtraceevent)
     - pkgconfig(liblzma)
     - pkgconfig(libzstd)
     - pkgconfig(python3)
@@ -30,16 +31,15 @@ build       : |
         perfexecdir=lib/perf \
         CC=clang \
         LLVM=1 \
-        WERROR=0 \
-        NO_LIBTRACEEVENT=1
+        WERROR=0
 install     : |
     %make_install -C tools/perf \
         prefix=/usr \
         lib=lib/perf \
         perfexecdir=lib/perf \
         CC=clang \
         LLVM=1 \
-        WERROR=0 NO_LIBTRACEEVENT=1
+        WERROR=0
 
     %install_file %(installroot)/etc/bash_completion.d/perf %(installroot)/%(completionsdir)/perf
     rm %(installroot)/etc/bash_completion.d/perf