* [PR PATCH] bpftrace: update to 0.16.0.
@ 2022-08-31 15:02 leahneukirchen
2022-11-30 2:03 ` github-actions
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: leahneukirchen @ 2022-08-31 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3524 bytes --]
From af9cc0a659e4e0a6796ceb8b294462a14e635be6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.0.0
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 33 +++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..1ac5d72e3043 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4182,3 +4182,4 @@ libsyncthingmodel.so.1.2.2 syncthingtray-1.2.2_1
libsyncthingconnector.so.1.2.2 syncthingtray-1.2.2_1
libglibutil.so.1 libglibutil-1.0.64_1
libgbinder.so.1 libgbinder-1.1.20_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..077638a28250
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,33 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.0.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=16701e7c3a731a03fe08dee9893c95a86c879192955d12bc7495645e9ab1bc6e
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ # XXX use version in kernel-libc-headers>=6.0
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From 0372259f1c5ef002f194c8baee0cb30a4fa0e191 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..2f746a230247 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,18 +1,18 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
post_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
@ 2022-11-30 2:03 ` github-actions
2023-01-06 14:15 ` [PR PATCH] [Updated] " leahneukirchen
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: github-actions @ 2022-11-30 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39002#issuecomment-1331550867
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
2022-11-30 2:03 ` github-actions
@ 2023-01-06 14:15 ` leahneukirchen
2023-01-06 14:17 ` leahneukirchen
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-06 14:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3493 bytes --]
From 455ebb02a9adbdc09563a95db3c85a12a9a04df6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0
libbpf: update to 1.1.0.
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 33 +++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..4cbbf89b152f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..64b6091d800b
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,33 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ # XXX use version in kernel-libc-headers>=6.0
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From dc5a6287e8f2de8d49f1fb157f2ed9c38370b5d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..2f746a230247 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,18 +1,18 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
post_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
2022-11-30 2:03 ` github-actions
2023-01-06 14:15 ` [PR PATCH] [Updated] " leahneukirchen
@ 2023-01-06 14:17 ` leahneukirchen
2023-01-06 14:59 ` leahneukirchen
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-06 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
~~To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)~~ libbpf 1.1.0 avoids needing this.
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3468 bytes --]
From 425d127574994aa962995c10ee1b13b54ba9b2ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 33 +++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..4cbbf89b152f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..64b6091d800b
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,33 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ # XXX use version in kernel-libc-headers>=6.0
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From eb33dd3d5671ed14731eb0a963694a399798d95f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..2f746a230247 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,18 +1,18 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
post_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
` (2 preceding siblings ...)
2023-01-06 14:17 ` leahneukirchen
@ 2023-01-06 14:59 ` leahneukirchen
2023-01-07 15:38 ` leahneukirchen
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-06 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
~~To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)~~ libbpf 1.1.0 avoids needing this.
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3660 bytes --]
From ef37825f063e4bed9663b5389407e42a0da3829f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 33 +++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..4cbbf89b152f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..0a0aaa71a86a
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,33 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' ${DESTDIR}/usr/include/bpf/btf.h
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/bpf/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From f904ee9c9c53a8cb2a8771c8085d011c34a529f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..857815d29eef 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,20 +1,24 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
+post_extract() {
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' src/btf.cpp
+}
+
post_install() {
# clashes with bcc-tools
rm -rf ${DESTDIR}/usr/share/man
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
` (3 preceding siblings ...)
2023-01-06 14:59 ` leahneukirchen
@ 2023-01-07 15:38 ` leahneukirchen
2023-01-07 16:06 ` leahneukirchen
2023-01-07 16:13 ` [PR PATCH] [Merged]: " leahneukirchen
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-07 15:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)
For now, I patched libbpf and bpftrace to use their own newer copy of UAPI. Pretty ugly, but also very limited scope.
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3722 bytes --]
From 5b6db2937604f320054b372894196ae48dcddaca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..4cbbf89b152f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..8ae0851d2d98
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,34 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ # ugly hack until kernel-libc-headers is at version 6.1 :/
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' ${DESTDIR}/usr/include/bpf/btf.h
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/bpf/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From 419eb263b10f1de942e1acc2fce71ad3587e6d20 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..857815d29eef 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,20 +1,24 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
+post_extract() {
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' src/btf.cpp
+}
+
post_install() {
# clashes with bcc-tools
rm -rf ${DESTDIR}/usr/share/man
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
` (4 preceding siblings ...)
2023-01-07 15:38 ` leahneukirchen
@ 2023-01-07 16:06 ` leahneukirchen
2023-01-07 16:13 ` [PR PATCH] [Merged]: " leahneukirchen
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-07 16:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages bpftrace016
https://github.com/void-linux/void-packages/pull/39002
bpftrace: update to 0.16.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)
For now, I patched libbpf and bpftrace to use their own newer copy of UAPI. Pretty ugly, but also very limited scope.
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
A patch file from https://github.com/void-linux/void-packages/pull/39002.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace016-39002.patch --]
[-- Type: text/x-diff, Size: 3720 bytes --]
From be4f7821bc6a1040aab61a56b071fc39c992a77f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 1/2] New package: libbpf-1.1.0
---
common/shlibs | 1 +
srcpkgs/libbpf-devel | 1 +
srcpkgs/libbpf/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libbpf-devel
create mode 100644 srcpkgs/libbpf/template
diff --git a/common/shlibs b/common/shlibs
index f4f5acece3fa..349c183cdb38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4219,3 +4219,4 @@ libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
+libbpf.so.1 libbpf-1.0.0_1
diff --git a/srcpkgs/libbpf-devel b/srcpkgs/libbpf-devel
new file mode 120000
index 000000000000..ad979046de86
--- /dev/null
+++ b/srcpkgs/libbpf-devel
@@ -0,0 +1 @@
+libbpf
\ No newline at end of file
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
new file mode 100644
index 000000000000..8ae0851d2d98
--- /dev/null
+++ b/srcpkgs/libbpf/template
@@ -0,0 +1,34 @@
+# Template file for 'libbpf'
+pkgname=libbpf
+version=1.1.0
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="elfutils-devel"
+short_desc="Library for working with (e)BPF"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only, BSD-2-Clause"
+homepage="https://github.com/libbpf/libbpf"
+distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
+checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+
+post_install() {
+ vlicense ../LICENSE
+ vlicense ../LICENSE.BSD-2-Clause
+
+ # ugly hack until kernel-libc-headers is at version 6.1 :/
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' ${DESTDIR}/usr/include/bpf/btf.h
+ vinstall ../include/uapi/linux/btf.h 0644 usr/include/bpf/linux
+}
+
+libbpf-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From ec0d10464827af7a2ce1faa7dabd147093de6921 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:59:54 +0200
Subject: [PATCH 2/2] bpftrace: update to 0.16.0.
---
srcpkgs/bpftrace/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 190cebb8e3bc..857815d29eef 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,20 +1,24 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.15.0
+version=0.16.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=64f67e615998d8150f5ee28614bea9ed303f20f6887bc4cdffa5f9c9477ef52a
+checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
nostrip=yes # needs to read own symbol table
+post_extract() {
+ vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' src/btf.cpp
+}
+
post_install() {
# clashes with bcc-tools
rm -rf ${DESTDIR}/usr/share/man
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: bpftrace: update to 0.16.0.
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
` (5 preceding siblings ...)
2023-01-07 16:06 ` leahneukirchen
@ 2023-01-07 16:13 ` leahneukirchen
6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2023-01-07 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
There's a merged pull request on the void-packages repository
bpftrace: update to 0.16.0.
https://github.com/void-linux/void-packages/pull/39002
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
This uses libbpf now, so package it.
To compile bpftrace properly, we need kernel-headers of Linux 6.0, this parking this PR for now.
(Then remove the `linux/btf.h` from libbpf-devel.)
For now, I patched libbpf and bpftrace to use their own newer copy of UAPI. Pretty ugly, but also very limited scope.
#### Testing the changes
- I tested the changes in this PR: **YES** (on 5.18)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-01-07 16:13 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-31 15:02 [PR PATCH] bpftrace: update to 0.16.0 leahneukirchen
2022-11-30 2:03 ` github-actions
2023-01-06 14:15 ` [PR PATCH] [Updated] " leahneukirchen
2023-01-06 14:17 ` leahneukirchen
2023-01-06 14:59 ` leahneukirchen
2023-01-07 15:38 ` leahneukirchen
2023-01-07 16:06 ` leahneukirchen
2023-01-07 16:13 ` [PR PATCH] [Merged]: " leahneukirchen
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).