[meta-security][PATCH 02/15] suricata: handle oe_cargo_build removal

Scott Murray <[email protected]>
Newsgroups org.yoctoproject.lists.yocto-patches
Message-ID <74e55cf4fb2e4a6f58a487ede7d4fe39d6101448.1787777775.git.scott.murray@konsulko.com>
Handle upstream removal of oe_cargo_build function in oe-core commit
a64ac03a61 by renaming our local override to cargo_do_compile to get
the same effect.

Signed-off-by: Scott Murray <[email protected]>
---
 recipes-ids/suricata/suricata_8.0.4.bb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/recipes-ids/suricata/suricata_8.0.4.bb b/recipes-ids/suricata/suricata_8.0.4.bb
index b3ab261..5ae0d97 100644
--- a/recipes-ids/suricata/suricata_8.0.4.bb
+++ b/recipes-ids/suricata/suricata_8.0.4.bb
@@ -86,12 +86,17 @@ CFLAGS += "-Wno-error=incompatible-pointer-types \
 # breaks building this recipe. Providing a copy of the original function
 # Armin 2025/04/01
 #
-oe_cargo_build () {
+# 08/2026 note - oe_cargo_build function inlined into cargo_do_compile
+# upstream in openembedded-core commit a64ac03a61, handle by renaming
+# our forked function to cargo_do_compile to override it directly.
+# This still works since before a64ac03a61 cargo_do_compile did nothing
+# but call oe_cargo_build.
+cargo_do_compile () {
     export RUSTFLAGS="${RUSTFLAGS}"
     bbnote "Using rust targets from ${RUST_TARGET_PATH}"
     bbnote "cargo = $(which ${CARGO})"
-    bbnote "${CARGO} build ${CARGO_BUILD_FLAGS}$@"
-    "${CARGO}" build ${CARGO_BUILD_FLAGS}"$@"
+    bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@"
+    "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@"
 }
 
 do_compile () {
-- 
2.55.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.