Skip to contentSkip to conversation

package/bpftrace: bump version to 0.25.1

PATCH In review Bernd Kuhls 2 participants 2 messages Apr 20 – Apr 21

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bpftrace: bump version to 0.25.1

https://github.com/bpftrace/bpftrace/blob/v0.25.1/CHANGELOG.md

Added configure option USE_SYSTEM_LIBBPF to use our libbpf package, needed due to upstream commit
https://github.com/bpftrace/bpftrace/commit/6d53738627d4f80c83f799f9e042f6bdd373a433
which was added to version 0.25.0.

This bump includes upstream commit
https://github.com/bpftrace/bpftrace/commit/c6442cde6e45945e3cfd72cb2fdbcca590454d0c
which adds support for LLVM 22 and fixes build errors introduced by buildroot commit 25cb3813e7fc6ed3e455f983cf0e09c7bc02fccb.

Fixes:
https://autobuild.buildroot.net/results/599/59920f909d808911ea2710938271ecfab48c367f/

---
 package/bpftrace/bpftrace.hash | 2 +-
 package/bpftrace/bpftrace.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
package/bpftrace/bpftrace.hash +1 -1
index 4add96aee3..9990ab3cdc 100644
@@ -1,3 +1,3 @@
 # locally calculated
-sha256  e0514aa3e1a032b0b2de2cf3c281bfee9b9e80509498e70ed78786bbd64db373  bpftrace-0.24.2.tar.gz
+sha256  89d1cb7448a650eecebe52e8deb6dfa85517ae91c465bccd5246abd4588707dc  bpftrace-0.25.1.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
package/bpftrace/bpftrace.mk +3 -2
index 7b1b41781a..e32798cb83 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BPFTRACE_VERSION = 0.24.2
+BPFTRACE_VERSION = 0.25.1
 BPFTRACE_SITE = $(call github,bpftrace,bpftrace,v$(BPFTRACE_VERSION))
 BPFTRACE_LICENSE = Apache-2.0
 BPFTRACE_LICENSE_FILES = LICENSE
@@ -30,6 +30,7 @@ BPFTRACE_CONF_OPTS += \
 	-DBUILD_TESTING:BOOL=OFF \
 	-DENABLE_MAN:BOOL=OFF \
 	-DINSTALL_TOOL_DOCS:BOOL=OFF \
-	-DUSE_SYSTEM_BPF_BCC:BOOL=ON
+	-DUSE_SYSTEM_BPF_BCC:BOOL=ON \
+	-DUSE_SYSTEM_LIBBPF:BOOL=ON
 
 $(eval $(cmake-package))
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi Bernd,

Thanks for the patch.

Quoted 20 lines · Bernd Kuhls

https://github.com/bpftrace/bpftrace/blob/v0.25.1/CHANGELOG.md

Added configure option USE_SYSTEM_LIBBPF to use our libbpf package, needed due to upstream commit
https://github.com/bpftrace/bpftrace/commit/6d53738627d4f80c83f799f9e042f6bdd373a433
which was added to version 0.25.0.

This bump includes upstream commit
https://github.com/bpftrace/bpftrace/commit/c6442cde6e45945e3cfd72cb2fdbcca590454d0c
which adds support for LLVM 22 and fixes build errors introduced by buildroot commit 25cb3813e7fc6ed3e455f983cf0e09c7bc02fccb.

Fixes:
https://autobuild.buildroot.net/results/599/59920f909d808911ea2710938271ecfab48c367f/

---
 package/bpftrace/bpftrace.hash | 2 +-
 package/bpftrace/bpftrace.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

[...]

package/bpftrace/bpftrace.mk line 8

Quoted 11 lines
package/bpftrace/bpftrace.mk +1 -1
index 7b1b41781a..e32798cb83 100644
@@ -4,7 +4,7 @@
 #
 
 ################################################################################
 
-BPFTRACE_VERSION = 0.24.2
+BPFTRACE_VERSION = 0.25.1

When trying to compile this new version on a aarch64 config, the compilation fails with:

/buildroot/output/build/bpftrace-0.25.1/src/bpffeature.cpp:463:41: error: ‘BPF_TRACE_KPROBE_SESSION’ was not declared in this scope

So either it should use the definition from the kernel header, introduced in v6.10:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=535a3692ba7245792e6f23654507865d4293c850

or it should use the definition included from libbpf, and there is a problem with it. Maybe our libbpf is too old.

Could you have a look please?

Quoted 13 lines
package/bpftrace/bpftrace.mk +0 -0
 BPFTRACE_SITE = $(call github,bpftrace,bpftrace,v$(BPFTRACE_VERSION))
 BPFTRACE_LICENSE = Apache-2.0

BPFTRACE_LICENSE_FILES = LICENSE

package/bpftrace/bpftrace.mk +2 -2
@@ -30,6 +30,7 @@ BPFTRACE_CONF_OPTS += \
 	-DBUILD_TESTING:BOOL=OFF \
 	-DENABLE_MAN:BOOL=OFF \
 	-DINSTALL_TOOL_DOCS:BOOL=OFF \
-	-DUSE_SYSTEM_BPF_BCC:BOOL=ON
+	-DUSE_SYSTEM_BPF_BCC:BOOL=ON \
+	-DUSE_SYSTEM_LIBBPF:BOOL=ON
 
 $(eval $(cmake-package))
--
Quoted 1 line

2.47.3

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot