diff mbox series

[meta-oe,1/5] bpftrace: Upgrade to 0.23.5 release

Message ID 20250901224244.1913647-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/5] bpftrace: Upgrade to 0.23.5 release | expand

Commit Message

Khem Raj Sept. 1, 2025, 10:42 p.m. UTC 
Drop backported patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-failures-due-to-missing-location.hh.patch | 54 -------------------
 ...{bpftrace_0.23.0.bb => bpftrace_0.23.5.bb} |  5 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch
 rename meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/{bpftrace_0.23.0.bb => bpftrace_0.23.5.bb} (94%)
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch
deleted file mode 100644
index 1c2ae33238..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From 24421ba92c69f1abaadaff01270621917616a2b8 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 17 Apr 2025 10:38:50 +0800
-Subject: [PATCH] Fix build failures due to missing location.hh
-
-ast/location.h does `#include "location.hh"` and location.hh is
-generated by the parser so any CMake target whose source includes
-ast/location.h needs to have a dependency on the `parser` target,
-otherwise the compilation may fail due to incorrect ordering of build
-targets. This also applies to targets which include ast/location.h
-transitively via other headers.
-
-To avoid such errors, do 2 things:
-- drop includes of ast/location.h where unused
-- for CMake targets including ast/location.h, add an explicit dependency
-  on the `parser` target
-
-Signed-off-by: Viktor Malik <viktor.malik@gmail.com>
-
-Upstream-Status: Backport [https://github.com/bpftrace/bpftrace/commit/743cb9c88c25fb9737d714f4d4ac853f05bb6481]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- src/CMakeLists.txt     | 1 +
- src/ast/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e04ee429..13a51040 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -21,6 +21,7 @@ add_library(compiler_core STATIC
-   struct.cpp
-   types.cpp
- )
-+add_dependencies(compiler_core parser)
- 
- add_library(runtime STATIC
-   attached_probe.cpp
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 92231f85..7230cf71 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -22,6 +22,7 @@ add_library(ast STATIC
-   passes/return_path_analyser.cpp
- )
- 
-+add_dependencies(ast parser)
- target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS})
- target_link_libraries(ast PUBLIC ast_defs arch compiler_core parser)
- 
--- 
-2.34.1
-
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb
similarity index 94%
rename from meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb
index c8ccf4c83f..1b2f8ab0e4 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb
@@ -16,14 +16,11 @@  DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-nativ
 
 RDEPENDS:${PN} += "bash python3 xz"
 
-PV .= "+git"
-
 SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.23.x;protocol=https \
            file://run-ptest \
            file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \
-           file://0001-Fix-build-failures-due-to-missing-location.hh.patch \
 "
-SRCREV = "01e806d24c61f996f1809e1e991646311499db4f"
+SRCREV = "e48ccc66c9971515648b63699bc4b1490c388d85"
 
 inherit bash-completion cmake ptest pkgconfig