diff options
2 files changed, 29 insertions, 2 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Add-BPF_CFLAGS-to-pass-flags-from-env.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Add-BPF_CFLAGS-to-pass-flags-from-env.patch new file mode 100644 index 0000000000..2f7ae8579b --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Add-BPF_CFLAGS-to-pass-flags-from-env.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From 7e21fcb2fc06a0da2850bbf7f1b04a9c148a0609 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 26 Oct 2025 20:06:42 -0700 | ||
| 4 | Subject: [PATCH] cmake: Add BPF_CFLAGS to pass flags from env | ||
| 5 | |||
| 6 | This can be used to pass flags to remove absolute paths from | ||
| 7 | debug info | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | cmake/BuildBPF.cmake | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/cmake/BuildBPF.cmake b/cmake/BuildBPF.cmake | ||
| 16 | index cb8cd687a..f72d96ecf 100644 | ||
| 17 | --- a/cmake/BuildBPF.cmake | ||
| 18 | +++ b/cmake/BuildBPF.cmake | ||
| 19 | @@ -90,7 +90,7 @@ function(bpf NAME) | ||
| 20 | OUTPUT ${ARG_OBJECT} | ||
| 21 | DEPENDS ${ARG_SOURCE} ${ARG_DEPENDS} | ||
| 22 | # See above: fresh compilation and the use of `gcc`. | ||
| 23 | - COMMAND ${GCC} -Wno-attributes -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} | ||
| 24 | + COMMAND ${GCC} ${BPF_CFLAGS} -Wno-attributes -g -I ${CMAKE_CURRENT_BINARY_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} | ||
| 25 | COMMAND cmake -E env LLVM_OBJCOPY=${LLVM_OBJCOPY} ${PAHOLE} -J ${CMAKE_CURRENT_BINARY_DIR}/${ARG_OBJECT} | ||
| 26 | VERBATIM | ||
| 27 | ) | ||
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 index add2ff01a8..7a66e7e2cc 100644 --- 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 | |||
| @@ -20,6 +20,7 @@ RDEPENDS:${PN}-ptest += "bpftool" | |||
| 20 | 20 | ||
| 21 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.24.x;protocol=https;tag=v${PV} \ | 21 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.24.x;protocol=https;tag=v${PV} \ |
| 22 | file://run-ptest \ | 22 | file://run-ptest \ |
| 23 | file://0001-cmake-Add-BPF_CFLAGS-to-pass-flags-from-env.patch \ | ||
| 23 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ | 24 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ |
| 24 | " | 25 | " |
| 25 | SRCREV = "4c1f02a43f993758d445952ccd96e552752defec" | 26 | SRCREV = "4c1f02a43f993758d445952ccd96e552752defec" |
| @@ -65,5 +66,4 @@ INHIBIT_PACKAGE_STRIP_FILES += "\ | |||
| 65 | ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \ | 66 | ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \ |
| 66 | " | 67 | " |
| 67 | 68 | ||
| 68 | WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}" | 69 | export BPF_FLAGS = "${DEBUG_PREFIX_MAP}" |
| 69 | ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}" | ||
