From e6fbb6330b61078ee6acb055b2dbac306708b3cd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Mar 2026 23:26:37 -0700 Subject: bpftrace: Upgrade to 0.25.1 release * This version works with llvm 22+ * Use system libbpf Signed-off-by: Khem Raj --- .../recipes-devtools/bpftrace/bpftrace_0.24.1.bb | 77 --------------------- .../recipes-devtools/bpftrace/bpftrace_0.25.1.bb | 78 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb deleted file mode 100644 index 37e088590f..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.1.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "bpftrace" -HOMEPAGE = "https://github.com/iovisor/bpftrace" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS += "bison-native \ - flex-native \ - gzip-native \ - elfutils \ - bpftool-native \ - bcc \ - libcereal \ - libbpf \ - xxd-native \ - " -DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" - -SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.24.x;protocol=https;tag=v${PV} \ - file://run-ptest \ - file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ -" -SRCREV = "4c1f02a43f993758d445952ccd96e552752defec" - -inherit bash-completion cmake ptest pkgconfig - -PACKAGECONFIG ?= " \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ - " - -PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest" -PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd" - -do_install_ptest() { - if [ -e ${B}/tests/bpftrace_test ]; then - install -Dm 755 ${B}/tests/bpftrace_test ${D}${PTEST_PATH}/tests/bpftrace_test - cp -rf ${B}/tests/runtime ${D}${PTEST_PATH}/tests - cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests - fi - for f in testlibs/cmake_install.cmake \ - testprogs/cmake_install.cmake \ - testlibs/CTestTestfile.cmake \ - testprogs/CTestTestfile.cmake - do - sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||' ${D}${libdir}/bpftrace/ptest/tests/$f - sed -i -e 's|${S}/||' ${D}${libdir}/bpftrace/ptest/tests/$f - sed -i -e 's|${B}/||' ${D}${libdir}/bpftrace/ptest/tests/$f - done -} - -do_install_ptest:powerpc64() { -} - -do_install_ptest:powerpc64le() { -} - -EXTRA_OECMAKE = " \ - -DCMAKE_ENABLE_EXPORTS=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_SYSTEM_BPF_BCC=ON \ - -DENABLE_MAN=OFF \ - -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \ -" - -PACKAGES:remove:powerpc64 = "${PN}-ptest" -PACKAGES:remove:powerpc64le = "${PN}-ptest" - -RDEPENDS:${PN}-ptest += "bash bpftool python3" - -COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux" - -INHIBIT_PACKAGE_STRIP_FILES += "\ - ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \ -" - -WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}" -ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb new file mode 100644 index 0000000000..f28c1547db --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.25.1.bb @@ -0,0 +1,78 @@ +SUMMARY = "bpftrace" +HOMEPAGE = "https://github.com/iovisor/bpftrace" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS += "bison-native \ + flex-native \ + gzip-native \ + elfutils \ + bpftool-native \ + bcc \ + libcereal \ + libbpf \ + xxd-native \ + " +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" + +SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.25.x;protocol=https;tag=v${PV} \ + file://run-ptest \ + file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ +" +SRCREV = "e491811e5d648288c01f42ce087967b271f504a0" + +inherit bash-completion cmake ptest pkgconfig + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ + " + +PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest" +PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd" + +do_install_ptest() { + if [ -e ${B}/tests/bpftrace_test ]; then + install -Dm 755 ${B}/tests/bpftrace_test ${D}${PTEST_PATH}/tests/bpftrace_test + cp -rf ${B}/tests/runtime ${D}${PTEST_PATH}/tests + cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests + fi + for f in testlibs/cmake_install.cmake \ + testprogs/cmake_install.cmake \ + testlibs/CTestTestfile.cmake \ + testprogs/CTestTestfile.cmake + do + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||' ${D}${libdir}/bpftrace/ptest/tests/$f + sed -i -e 's|${S}/||' ${D}${libdir}/bpftrace/ptest/tests/$f + sed -i -e 's|${B}/||' ${D}${libdir}/bpftrace/ptest/tests/$f + done +} + +do_install_ptest:powerpc64() { +} + +do_install_ptest:powerpc64le() { +} + +EXTRA_OECMAKE = " \ + -DCMAKE_ENABLE_EXPORTS=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_SYSTEM_BPF_BCC=ON \ + -DUSE_SYSTEM_LIBBPF=ON \ + -DENABLE_MAN=OFF \ + -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \ +" + +PACKAGES:remove:powerpc64 = "${PN}-ptest" +PACKAGES:remove:powerpc64le = "${PN}-ptest" + +RDEPENDS:${PN}-ptest += "bash bpftool python3" + +COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux" + +INHIBIT_PACKAGE_STRIP_FILES += "\ + ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \ +" + +WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}" +ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}" -- cgit v1.2.3-54-g00ecf