From 5313a0c50b1efcf70a72fe32e4dd765efc514281 Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 22 Sep 2026 11:32:48 +0200 Subject: [PATCH 01/11] Update score_baselibs commit hash to latest version --- bazel_common/score_modules_target_sw.MODULE.bazel | 2 +- known_good.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 96c595bd41f..37504288272 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep(name = "score_baselibs") git_override( module_name = "score_baselibs", - commit = "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7", + commit = "f2af2ddb0688abf3bf7516f87bd740afbf1965f8", patch_strip = 1, patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", diff --git a/known_good.json b/known_good.json index 5e93c31024a..22a835ef80f 100644 --- a/known_good.json +++ b/known_good.json @@ -26,7 +26,7 @@ "cpp" ] }, - "hash": "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7" + "hash": "f2af2ddb0688abf3bf7516f87bd740afbf1965f8" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", From 4fd4fa23d840ca8cf78b000bddd7ea6b52970f87 Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 22 Sep 2026 15:00:49 +0200 Subject: [PATCH 02/11] com: add migration patch for baselibs Rust targets --- .../score_modules_target_sw.MODULE.bazel | 1 + known_good.json | 10 +-- .../005-migrate-baselibs-rust-targets.patch | 77 +++++++++++++++++++ 3 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 patches/communication/005-migrate-baselibs-rust-targets.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 37504288272..41a71514fcc 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -37,6 +37,7 @@ git_override( "//patches/communication:001-expose-comm-examples.patch", "//patches/communication:003-module-deps-visibility.patch", "//patches/communication:004-rules-build-error-not-dev-dependency.patch", + "//patches/communication:005-migrate-baselibs-rust-targets.patch", ], remote = "https://github.com/eclipse-score/communication.git", ) diff --git a/known_good.json b/known_good.json index 22a835ef80f..9146eab8238 100644 --- a/known_good.json +++ b/known_good.json @@ -35,7 +35,8 @@ "bazel_patches": [ "//patches/communication:001-expose-comm-examples.patch", "//patches/communication:003-module-deps-visibility.patch", - "//patches/communication:004-rules-build-error-not-dev-dependency.patch" + "//patches/communication:004-rules-build-error-not-dev-dependency.patch", + "//patches/communication:005-migrate-baselibs-rust-targets.patch" ], "metadata": { "code_root_path": "//score/mw/com/impl/...", @@ -57,12 +58,7 @@ "rust" ], "rust_coverage_config": "ferrocene-coverage" - }, - "bazel_patches": [ - "//patches/communication:001-expose-comm-examples.patch", - "//patches/communication:003-module-deps-visibility.patch", - "//patches/communication:004-rules-build-error-not-dev-dependency.patch" - ] + } }, "score_persistency": { "repo": "https://github.com/eclipse-score/persistency.git", diff --git a/patches/communication/005-migrate-baselibs-rust-targets.patch b/patches/communication/005-migrate-baselibs-rust-targets.patch new file mode 100644 index 00000000000..5d25104a85e --- /dev/null +++ b/patches/communication/005-migrate-baselibs-rust-targets.patch @@ -0,0 +1,77 @@ +diff --git a/score/mw/com/example/com-api-example/BUILD b/score/mw/com/example/com-api-example/BUILD +index 4c834d489a..41c340eb68 100644 +--- a/score/mw/com/example/com-api-example/BUILD ++++ b/score/mw/com/example/com-api-example/BUILD +@@ -21,7 +21,7 @@ rust_library( + deps = [ + "//score/mw/com/example/com-api-example/com-api-gen", + "//score/mw/com/rust:score_com", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + "@score_communication_crate_index//:clap", + "@score_communication_crate_index//:futures", + ], +@@ -42,8 +42,8 @@ rust_binary( + ":com-api-example-lib", + "//score/mw/com/example/com-api-example/com-api-gen", + "//score/mw/com/rust:score_com", +- "@score_baselibs//src/log/score_log", +- "@score_baselibs//src/log/stdout_logger", ++ "@score_baselibs//score/log_rust/score_log", ++ "@score_baselibs//score/log_rust/stdout_logger", + "@score_communication_crate_index//:clap", + "@score_communication_crate_index//:futures", + ], +diff --git a/score/mw/com/example/com-api-example/com-api-gen/BUILD b/score/mw/com/example/com-api-example/com-api-gen/BUILD +index 94f6c8f96e..cd8ea32df7 100644 +--- a/score/mw/com/example/com-api-example/com-api-gen/BUILD ++++ b/score/mw/com/example/com-api-example/com-api-gen/BUILD +@@ -26,7 +26,7 @@ rust_library( + deps = [ + ":vehicle_gen_cpp", + "//score/mw/com/rust:score_com", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) + +diff --git a/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD b/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD +index a988186a96..81cd80485a 100644 +--- a/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD ++++ b/score/mw/com/impl/rust/com-api/com-api-ffi-lola/BUILD +@@ -68,6 +68,6 @@ rust_library( + deps = [ + ":bridge_ffi_rs", + "//score/mw/com/impl/plumbing/rust:sample_ptr_rs", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) +diff --git a/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD b/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD +index aa5d094e23..3e7a59418e 100644 +--- a/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD ++++ b/score/mw/com/impl/rust/com-api/com-api-runtime-lola/BUILD +@@ -28,7 +28,7 @@ rust_library( + "//score/mw/com/impl/rust/com-api/com-api-ffi-lola:bridge_ffi_lola", + "//score/mw/com/impl/rust/com-api/com-api-ffi-lola:bridge_ffi_rs", + "//score/mw/com/rust/score_com_concept", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + "@score_communication_crate_index//:futures", + ], + ) +diff --git a/score/mw/com/rust/score_com_concept/BUILD b/score/mw/com/rust/score_com_concept/BUILD +index 5386e8b2ef..8f51c7e6db 100644 +--- a/score/mw/com/rust/score_com_concept/BUILD ++++ b/score/mw/com/rust/score_com_concept/BUILD +@@ -25,8 +25,8 @@ rust_library( + "//score/mw/com:__subpackages__", + ], + deps = [ +- "@score_baselibs//src/containers", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/containers_rust:containers", ++ "@score_baselibs//score/log_rust/score_log", + "@score_communication_crate_index//:futures", + "@score_communication_crate_index//:thiserror", + ], From 2dc5a5e8e0ab1c9f92581bc17cdcba8c1bc96a8f Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 22 Sep 2026 15:24:56 +0200 Subject: [PATCH 03/11] persistency: add migration patch for baselibs Rust targets --- .../score_modules_target_sw.MODULE.bazel | 1 + known_good.json | 4 +-- .../007-migrate-baselibs-rust-targets.patch | 26 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 patches/persistency/007-migrate-baselibs-rust-targets.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 41a71514fcc..c3f5eaef483 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -54,6 +54,7 @@ git_override( "//patches/persistency:004-imagefs-not-dev-dependency.patch", "//patches/persistency:005-googletest-not-dev-dependency.patch", "//patches/persistency:006-add-module-index-title.patch", + "//patches/persistency:007-migrate-baselibs-rust-targets.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/known_good.json b/known_good.json index 9146eab8238..d0b286b8a80 100644 --- a/known_good.json +++ b/known_good.json @@ -68,7 +68,8 @@ "//patches/persistency:003-pip-not-dev-dependency.patch", "//patches/persistency:004-imagefs-not-dev-dependency.patch", "//patches/persistency:005-googletest-not-dev-dependency.patch", - "//patches/persistency:006-add-module-index-title.patch" + "//patches/persistency:006-add-module-index-title.patch", + "//patches/persistency:007-migrate-baselibs-rust-targets.patch" ], "metadata": { "code_root_path": "//score/kvs/...", @@ -77,7 +78,6 @@ "@score_baselibs//score/json:base_library=nlohmann", "@score_logging//score/mw/log/flags:KRemote_Logging=False" ], - "code_root_path": "//score/kvs/...", "exclude_test_targets": [ "//score/kvs/tests:bm_kvs_cpp", "//score/kvs/tests/integration_test_scenarios/...", diff --git a/patches/persistency/007-migrate-baselibs-rust-targets.patch b/patches/persistency/007-migrate-baselibs-rust-targets.patch new file mode 100644 index 00000000000..df24cb2e6a6 --- /dev/null +++ b/patches/persistency/007-migrate-baselibs-rust-targets.patch @@ -0,0 +1,26 @@ +diff --git a/score/kvs/rust_kvs/BUILD b/score/kvs/rust_kvs/BUILD +index 0be840f70..07c7bf1fc 100644 +--- a/score/kvs/rust_kvs/BUILD ++++ b/score/kvs/rust_kvs/BUILD +@@ -17,7 +17,7 @@ rust_library( + srcs = glob(["src/**/*.rs"]), + visibility = ["//visibility:public"], + deps = [ +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + "@score_crates//:adler32", + "@score_crates//:tinyjson", + ], +diff --git a/score/kvs/rust_kvs_tool/BUILD b/score/kvs/rust_kvs_tool/BUILD +index 831304c5e..47c9fcbf5 100644 +--- a/score/kvs/rust_kvs_tool/BUILD ++++ b/score/kvs/rust_kvs_tool/BUILD +@@ -27,7 +27,7 @@ rust_binary( + visibility = ["//visibility:public"], + deps = [ + "//score/kvs/rust_kvs", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + "@score_crates//:pico_args", + "@score_crates//:tinyjson", + "@score_logging//score/mw/log/rust/score_log_bridge", From 30c10f966d493a13d2882e06bf004e3c175c8a95 Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 22 Sep 2026 15:48:08 +0200 Subject: [PATCH 04/11] build: allow Bazel to continue building after errors --- .github/workflows/build_and_test_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test_linux.yml b/.github/workflows/build_and_test_linux.yml index 44eeed1f9ab..68906c508ce 100644 --- a/.github/workflows/build_and_test_linux.yml +++ b/.github/workflows/build_and_test_linux.yml @@ -48,7 +48,7 @@ jobs: enable-cache: false - name: Build image and product SBOM run: | - bazel build --lockfile_mode=error --config=linux-x86_64 \ + bazel build --lockfile_mode=error --config=linux-x86_64 --keep_going \ //images/linux_x86_64:image \ //:sbom - name: Integration tests From ff36a996ff4bab8fd4fffde9a2ffa58942289762 Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 22 Sep 2026 18:56:05 +0200 Subject: [PATCH 05/11] lifecycle: add migration patch for baselibs Rust targets and update Bazel configuration --- .../score_modules_target_sw.MODULE.bazel | 4 + known_good.json | 3 + .../001-migrate-baselibs-rust-targets.patch | 92 +++++++++++++++++++ patches/lifecycle/BUILD | 0 4 files changed, 99 insertions(+) create mode 100644 patches/lifecycle/001-migrate-baselibs-rust-targets.patch create mode 100644 patches/lifecycle/BUILD diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index c3f5eaef483..50c514dd793 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -74,6 +74,10 @@ bazel_dep(name = "score_lifecycle") git_override( module_name = "score_lifecycle", commit = "85da2168328d17a3cf53791ebf93534e5ed921fc", + patch_strip = 1, + patches = [ + "//patches/lifecycle:001-migrate-baselibs-rust-targets.patch", + ], remote = "https://github.com/eclipse-score/lifecycle.git", ) diff --git a/known_good.json b/known_good.json index d0b286b8a80..b2a106c0fa2 100644 --- a/known_good.json +++ b/known_good.json @@ -104,6 +104,9 @@ }, "score_lifecycle": { "repo": "https://github.com/eclipse-score/lifecycle.git", + "bazel_patches": [ + "//patches/lifecycle:001-migrate-baselibs-rust-targets.patch" + ], "metadata": { "code_root_path": "//score/...", "extra_test_config": [], diff --git a/patches/lifecycle/001-migrate-baselibs-rust-targets.patch b/patches/lifecycle/001-migrate-baselibs-rust-targets.patch new file mode 100644 index 00000000000..fabadf7d25a --- /dev/null +++ b/patches/lifecycle/001-migrate-baselibs-rust-targets.patch @@ -0,0 +1,92 @@ +diff --git a/examples/rust_supervised_app/BUILD b/examples/rust_supervised_app/BUILD +index 9738ceb0b7..2dff53f79c 100644 +--- a/examples/rust_supervised_app/BUILD ++++ b/examples/rust_supervised_app/BUILD +@@ -36,8 +36,8 @@ rust_binary( + deps = [ + "//score/health_monitor:health_monitoring_rust", + "//score/launch_manager:lifecycle_rust", +- "@score_baselibs//src/log/score_log", +- "@score_baselibs//src/log/stdout_logger", ++ "@score_baselibs//score/log_rust/score_log", ++ "@score_baselibs//score/log_rust/stdout_logger", + "@score_crates//:clap", + "@score_crates//:libc", + "@score_crates//:signal_hook", +diff --git a/score/health_monitor/src/rust/BUILD b/score/health_monitor/src/rust/BUILD +index 44ab61c9e2..15b09001f1 100644 +--- a/score/health_monitor/src/rust/BUILD ++++ b/score/health_monitor/src/rust/BUILD +@@ -14,14 +14,14 @@ + load("@rules_rust//rust:defs.bzl", "miri_test", "rust_library", "rust_static_library", "rust_test") + + COMMON_RUST_DEPS = [ +- "@score_baselibs//src/containers:containers", +- "@score_baselibs//src/thread:thread", +- "@score_baselibs//src/log/score_log:score_log", ++ "@score_baselibs//score/containers_rust:containers", ++ "@score_baselibs//score/thread", ++ "@score_baselibs//score/log_rust/score_log", + "//score/launch_manager:alive_rust", + ] + + PROC_MACRO_DEPS = [ +- "@score_baselibs//src/testing_macros:score_testing_macros", ++ "@score_baselibs//score/testing_macros:score_testing_macros", + ] + + rust_library( +@@ -78,7 +78,7 @@ rust_test( + "//config:unit_host": ["@platforms//os:linux"], # see https://github.com/eclipse-score/lifecycle/issues/272 + "//conditions:default": ["@platforms//:incompatible"], + }), +- deps = ["@score_baselibs//src/log/stdout_logger"], ++ deps = ["@score_baselibs//score/log_rust/stdout_logger"], + ) + + rust_test( +@@ -110,7 +110,7 @@ rust_test( + "//conditions:default": ["@platforms//:incompatible"], + }), + deps = [ +- "@score_baselibs//src/log/stdout_logger", ++ "@score_baselibs//score/log_rust/stdout_logger", + "@score_crates//:loom", + ], + ) +diff --git a/examples/cpp_supervised_app/BUILD b/examples/cpp_supervised_app/BUILD +index 984f359388..320e13240d 100644 +--- a/examples/cpp_supervised_app/BUILD ++++ b/examples/cpp_supervised_app/BUILD +@@ -34,6 +34,6 @@ cc_binary( + deps = [ + "//score/health_monitor:health_monitoring_cc", + "//score/launch_manager:lifecycle_cc", +- "@score_baselibs//src/log/stdout_logger_cpp_init", ++ "@score_baselibs//score/log_rust/stdout_logger_cpp_init", + ], + ) +diff --git a/score/health_monitor/src/cpp/details/BUILD b/score/health_monitor/src/cpp/details/BUILD +index 6dbd9e45fa..7ccfa29283 100644 +--- a/score/health_monitor/src/cpp/details/BUILD ++++ b/score/health_monitor/src/cpp/details/BUILD +@@ -19,6 +19,6 @@ cc_library( + visibility = ["//score/health_monitor/src/cpp:__pkg__"], + deps = [ + "@googletest//:gtest", +- "@score_baselibs//src/log/stdout_logger_cpp_init", ++ "@score_baselibs//score/log_rust/stdout_logger_cpp_init", + ], + ) +diff --git a/tests/integration/complex_monitoring/BUILD b/tests/integration/complex_monitoring/BUILD +index 15306f47ec..7467efa724 100644 +--- a/tests/integration/complex_monitoring/BUILD ++++ b/tests/integration/complex_monitoring/BUILD +@@ -42,6 +42,6 @@ cc_binary( + "//score/launch_manager:lifecycle_cc", + "//tests/utils/test_helper", + "@googletest//:gtest_main", +- "@score_baselibs//src/log/stdout_logger_cpp_init", ++ "@score_baselibs//score/log_rust/stdout_logger_cpp_init", + ], + ) diff --git a/patches/lifecycle/BUILD b/patches/lifecycle/BUILD new file mode 100644 index 00000000000..e69de29bb2d From 076a7da849df45cd03f4c5901db501125c1f8485 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 09:03:26 +0000 Subject: [PATCH 06/11] chore: update baselibs to latest main, drop rename-manual-verification-report patch Baselibs eclipse-score/baselibs#618 fixed the module_verification_report post_template to include all components and switched baselibs' own docs/verification_report/module_verification_report.rst to generate its report via the shared module_verification_report post_template, keeping the id doc__baselibs_verification_report (the template derives the module id by stripping doc__/_verification_report from the need's own id, so this id is now load-bearing). patches/baselibs/005-rename-manual-verification-report-id.patch is no longer compatible with that: reapplying it would rename the id to doc__baselibs_manual_verification_report, which the template would then misparse as module id baselibs_manual, producing an empty report. - Bump score_baselibs known_good pin to 9216215f3a8468f3487884b472e1f325ef36f92b (main after #618). - Drop patch 005 from known_good.json and regenerate bazel_common/score_modules_target_sw.MODULE.bazel. - Simplify docs/verification_report/modules/baselibs/baselibs_verification_report.rst: it no longer redeclares a document with the (now colliding) id, it just links to the report baselibs itself contributes via its docs bundle mount. - Refresh MODULE.bazel.lock via 'bazel mod deps --lockfile_mode=update'. --- MODULE.bazel.lock | 2 ++ .../score_modules_target_sw.MODULE.bazel | 3 +-- .../baselibs/baselibs_verification_report.rst | 18 ++++---------- known_good.json | 3 +-- ...rename-manual-verification-report-id.patch | 24 ------------------- 5 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 patches/baselibs/005-rename-manual-verification-report-id.patch diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e6ef672d947..506d90de807 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -215,6 +215,7 @@ "https://bcr.bazel.build/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "2ef4962c8b0b6d8d21928a89190755619254459bc67f870dc0ccb9ba9952d444", "https://bcr.bazel.build/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "37389c6b5a40c59410b4226d3bb54b08637f393d66e2fa57925c6fcf68e64bf4", "https://bcr.bazel.build/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "537faf0ad9f5892910074b8e43b4c91c96f1d5d86b6ed04bdbe40cf68aa48b68", + "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "77f2a1958d1d07376dd3ce3ae16540f2c1b01921c1fd21930827271260e75a66", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/source.json": "ae9f3d9dc7bec033976cf47165a78788bebad2b5c272241063ae31bad8664fd4", "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", @@ -742,6 +743,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildozer/7.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/bzip2/1.0.8.bcr.3/MODULE.bazel": "not found", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 50c514dd793..1bc0691d032 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -17,12 +17,11 @@ bazel_dep(name = "score_baselibs") git_override( module_name = "score_baselibs", - commit = "f2af2ddb0688abf3bf7516f87bd740afbf1965f8", + commit = "9216215f3a8468f3487884b472e1f325ef36f92b", patch_strip = 1, patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:005-rename-manual-verification-report-id.patch", "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch", ], remote = "https://github.com/eclipse-score/baselibs.git", diff --git a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst index 2769de2e0e7..3ed63add0df 100644 --- a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst +++ b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst @@ -15,17 +15,9 @@ Baselibs Module Verification Report ==================================== -.. document:: Baselibs Module Verification Report - :id: doc__baselibs_verification_report - :post_template: module_verification_report - :status: valid - :safety: QM - :security: NO - :realizes: wp__verification_module_ver_report - :report_version: v1.0 - :version: 1 +Baselibs generates its own module verification report directly from its own +needs data, using the module verification report template introduced by +docs-as-code: :need:`doc__baselibs_verification_report`. -This report is generated from baselibs' own needs data. -It uses the module verification report template introduced by docs-as-code. -It complements baselibs' own hand-written verification report, -:need:`doc__baselibs_manual_verification_report`. +See :doc:`/modules/score_baselibs/verification_report/module_verification_report` +for the full report. diff --git a/known_good.json b/known_good.json index 6ac67653462..d010bc3f28d 100644 --- a/known_good.json +++ b/known_good.json @@ -6,7 +6,6 @@ "bazel_patches": [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:005-rename-manual-verification-report-id.patch", "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch" ], "metadata": { @@ -26,7 +25,7 @@ "cpp" ] }, - "hash": "f2af2ddb0688abf3bf7516f87bd740afbf1965f8" + "hash": "9216215f3a8468f3487884b472e1f325ef36f92b" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", diff --git a/patches/baselibs/005-rename-manual-verification-report-id.patch b/patches/baselibs/005-rename-manual-verification-report-id.patch deleted file mode 100644 index 6e419260b46..00000000000 --- a/patches/baselibs/005-rename-manual-verification-report-id.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/docs/module/safety_mgt/module_safety_plan.rst b/docs/module/safety_mgt/module_safety_plan.rst ---- a/docs/module/safety_mgt/module_safety_plan.rst -+++ b/docs/module/safety_mgt/module_safety_plan.rst -@@ -109,7 +109,7 @@ Module Work products List - * - :need:`wp__verification_module_ver_report` - - :need:`gd_temp__mod_ver_report` - - :ndf:`copy('status', need_id='gd_temp__mod_ver_report')` -- - :need:`doc__baselibs_verification_report` -+ - :need:`doc__baselibs_manual_verification_report` - - * - :need:`wp__module_sw_release_note` - - :need:`gd_temp__rel_mod_rel_note` -diff --git a/docs/verification_report/module_verification_report.rst b/docs/verification_report/module_verification_report.rst ---- a/docs/verification_report/module_verification_report.rst -+++ b/docs/verification_report/module_verification_report.rst -@@ -18,7 +18,7 @@ Verification Report - .. note:: Document header - - .. document:: Baselibs Verification Report -- :id: doc__baselibs_verification_report -+ :id: doc__baselibs_manual_verification_report - :status: draft - :version: 1 - :safety: ASIL_B From adddea3c62ad5db071f43816c1ff33beb1641fc5 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 09:19:10 +0000 Subject: [PATCH 07/11] docs(verification_report): link baselibs module report directly, drop wrapper Remove docs/verification_report/modules/baselibs/, which only redeclared a redundant document need. Link modules/index.rst directly to /modules/score_baselibs/verification_report/module_verification_report, the report baselibs itself contributes via its docs bundle mount, so clicking "Baselibs" jumps straight to it instead of an intermediate wrapper page. --- .../baselibs/baselibs_verification_report.rst | 23 ------------------- docs/verification_report/modules/index.rst | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 docs/verification_report/modules/baselibs/baselibs_verification_report.rst diff --git a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst deleted file mode 100644 index 3ed63add0df..00000000000 --- a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst +++ /dev/null @@ -1,23 +0,0 @@ -.. - # ******************************************************************************* - # Copyright (c) 2026 Contributors to the Eclipse Foundation - # - # See the NOTICE file(s) distributed with this work for additional - # information regarding copyright ownership. - # - # This program and the accompanying materials are made available under the - # terms of the Apache License Version 2.0 which is available at - # https://www.apache.org/licenses/LICENSE-2.0 - # - # SPDX-License-Identifier: Apache-2.0 - # ******************************************************************************* - -Baselibs Module Verification Report -==================================== - -Baselibs generates its own module verification report directly from its own -needs data, using the module verification report template introduced by -docs-as-code: :need:`doc__baselibs_verification_report`. - -See :doc:`/modules/score_baselibs/verification_report/module_verification_report` -for the full report. diff --git a/docs/verification_report/modules/index.rst b/docs/verification_report/modules/index.rst index 72f6777a712..0f4468033f8 100644 --- a/docs/verification_report/modules/index.rst +++ b/docs/verification_report/modules/index.rst @@ -19,12 +19,12 @@ This page lists the per-module verification reports, each generated from the respective module's own needs data using the module verification report template introduced by docs-as-code. -* :doc:`Baselibs ` +* :doc:`Baselibs ` * :doc:`Persistency ` .. toctree:: :titlesonly: :hidden: - Baselibs + Baselibs Persistency From 10d3e4438b6e078742fcc4da0d01e00b1d8538ae Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 11:08:53 +0000 Subject: [PATCH 08/11] chore: drop stale buildifier_prebuilt 8.2.0.2 entries from MODULE.bazel.lock bazel mod tidy in CI removes the obsolete registryFileHashes entries for buildifier_prebuilt/8.2.0.2, which are no longer part of the resolved dependency graph. Sync the lockfile to fix the bzlmod-lock-check. --- MODULE.bazel.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 506d90de807..e6ef672d947 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -215,7 +215,6 @@ "https://bcr.bazel.build/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "2ef4962c8b0b6d8d21928a89190755619254459bc67f870dc0ccb9ba9952d444", "https://bcr.bazel.build/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "37389c6b5a40c59410b4226d3bb54b08637f393d66e2fa57925c6fcf68e64bf4", "https://bcr.bazel.build/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "537faf0ad9f5892910074b8e43b4c91c96f1d5d86b6ed04bdbe40cf68aa48b68", - "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "77f2a1958d1d07376dd3ce3ae16540f2c1b01921c1fd21930827271260e75a66", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/source.json": "ae9f3d9dc7bec033976cf47165a78788bebad2b5c272241063ae31bad8664fd4", "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", @@ -743,7 +742,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildozer/7.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/bzip2/1.0.8.bcr.3/MODULE.bazel": "not found", From 49e590d3647f81bb175dc62eeb0dd60fef710957 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Fri, 25 Sep 2026 08:45:54 +0000 Subject: [PATCH 09/11] fix(config_management): follow the string_manipulation move in baselibs baselibs 0bde8113d ("memory: remove deprecated string manipulation shims") dropped the forwarding headers that still lived under score/memory; string_literal, string_comparison_adaptor and split_string_view have been in //score/string_manipulation since 980a5510d. config_management never followed, so against the baselibs commit this branch pins, config_provider_impl.h fails to compile with fatal error: score/memory/string_comparison_adaptor.h: No such file Point the include at the new path and add the Bazel dependency explicitly. It was only reachable transitively via score/json/internal/model before, which is not something a header should rely on. Upstream has nothing to wait for: neither main nor any open PR or branch in eclipse-score/config_management touches this header, so the patch stays until the module migrates itself. While here, drop the duplicate "bazel_patches" key in the module's known_good.json entry - the later one silently won. --- .../score_modules_target_sw.MODULE.bazel | 1 + known_good.json | 8 +++--- .../002-migrate-baselibs-targets.patch | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 patches/config_management/002-migrate-baselibs-targets.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 7180a7e4a79..4b2e921542b 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -101,6 +101,7 @@ git_override( patch_strip = 1, patches = [ "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch", + "//patches/config_management:002-migrate-baselibs-targets.patch", ], remote = "https://github.com/eclipse-score/config_management.git", ) diff --git a/known_good.json b/known_good.json index 473587775b4..890a55b3585 100644 --- a/known_good.json +++ b/known_good.json @@ -150,7 +150,8 @@ "docs": false, "hash": "e0489b190ed6d2fa183b9a8063e2dba4f6378505", "bazel_patches": [ - "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch" + "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch", + "//patches/config_management:002-migrate-baselibs-targets.patch" ], "metadata": { "code_root_path": "//score/config_management/...", @@ -169,10 +170,7 @@ "cpp" ], "rust_coverage_config": "ferrocene-coverage" - }, - "bazel_patches": [ - "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch" - ] + } } }, "tooling": { diff --git a/patches/config_management/002-migrate-baselibs-targets.patch b/patches/config_management/002-migrate-baselibs-targets.patch new file mode 100644 index 00000000000..96820dc56a2 --- /dev/null +++ b/patches/config_management/002-migrate-baselibs-targets.patch @@ -0,0 +1,26 @@ +diff --git a/score/config_management/config_provider/code/config_provider/details/BUILD b/score/config_management/config_provider/code/config_provider/details/BUILD +index 937b056..9a71294 100644 +--- a/score/config_management/config_provider/code/config_provider/details/BUILD ++++ b/score/config_management/config_provider/code/config_provider/details/BUILD +@@ -21,6 +21,7 @@ cc_library( + "@score_baselibs//score/concurrency:condition_variable", + "@score_baselibs//score/concurrency/future", + "@score_baselibs//score/language/futurecpp", ++ "@score_baselibs//score/string_manipulation:string_comparison_adaptor", + "@score_communication//score/mw/service:proxy_data", + "@score_logging//score/mw/log", + ], +diff --git a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h b/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h +index 7630e60..596a8e6 100644 +--- a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h ++++ b/score/config_management/config_provider/code/config_provider/details/config_provider_impl.h +@@ -19,8 +19,8 @@ + #include "score/config_management/config_provider/code/persistency/persistency.h" + #include "score/config_management/config_provider/code/proxies/internal_config_provider.h" + +-#include "score/memory/string_comparison_adaptor.h" + #include "score/mw/log/logger.h" ++#include "score/string_manipulation/string_comparison_adaptor.h" + + #include "score/concurrency/condition_variable.h" + #include "score/mw/service/proxy_data.h" From 5627cc364b4ea84b60cd1b024208c0866235958f Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Fri, 25 Sep 2026 13:11:22 +0000 Subject: [PATCH 10/11] fix(logging): follow the string_manipulation and log_rust moves in baselibs Two independent baselibs restructurings caught up with score_logging at the same time: 980a5510d string_literal moved to //score/string_manipulation 9c2a4481b Rust components moved from //src/log to //score/log_rust 0bde8113d the deprecated score/memory shims were finally removed Against the baselibs commit this branch pins, that leaves four dead labels: score/datarouter/error -> score/memory:string_literal score_log_bridge (2x) -> src/log/score_log score_log_bridge_cpp_init -> src/log/score_log The first one breaks the x86_64 Linux and QNX8 image builds, the Rust ones abort analysis of the whole module, which is why score_logging reported zero executed tests. The same three files are already rewritten this way in eclipse-score/logging#271, but that is a syslog-backend feature PR tied to baselibs#502, not a migration, and it is behind main. Nothing else upstream addresses this, so carry the change here until the module migrates on its own. --- .../score_modules_target_sw.MODULE.bazel | 4 ++ known_good.json | 4 +- .../001-migrate-baselibs-targets.patch | 47 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 patches/logging/001-migrate-baselibs-targets.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 4b2e921542b..f5cd4622b97 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -80,6 +80,10 @@ bazel_dep(name = "score_logging") git_override( module_name = "score_logging", commit = "c8e85fd862d3cd281d263a87b3dcc3d59f8fa1a5", + patch_strip = 1, + patches = [ + "//patches/logging:001-migrate-baselibs-targets.patch", + ], remote = "https://github.com/eclipse-score/logging.git", ) diff --git a/known_good.json b/known_good.json index 890a55b3585..ad9f86ac5ec 100644 --- a/known_good.json +++ b/known_good.json @@ -114,7 +114,9 @@ }, "score_logging": { "repo": "https://github.com/eclipse-score/logging.git", - "bazel_patches": [], + "bazel_patches": [ + "//patches/logging:001-migrate-baselibs-targets.patch" + ], "metadata": { "code_root_path": "//score/mw/log/...", "extra_test_config": [ diff --git a/patches/logging/001-migrate-baselibs-targets.patch b/patches/logging/001-migrate-baselibs-targets.patch new file mode 100644 index 00000000000..d34e1f0d311 --- /dev/null +++ b/patches/logging/001-migrate-baselibs-targets.patch @@ -0,0 +1,47 @@ +diff --git a/score/datarouter/error/BUILD b/score/datarouter/error/BUILD +index 714d0f3..ef3c4d1 100644 +--- a/score/datarouter/error/BUILD ++++ b/score/datarouter/error/BUILD +@@ -25,7 +25,7 @@ cc_library( + features = COMPILER_WARNING_FEATURES, + visibility = ["@score_logging//score/datarouter:__subpackages__"], + deps = [ +- "@score_baselibs//score/memory:string_literal", + "@score_baselibs//score/result", ++ "@score_baselibs//score/string_manipulation:string_literal", + ], + ) +diff --git a/score/mw/log/rust/score_log_bridge/BUILD b/score/mw/log/rust/score_log_bridge/BUILD +index 5274d1b..ade0725 100644 +--- a/score/mw/log/rust/score_log_bridge/BUILD ++++ b/score/mw/log/rust/score_log_bridge/BUILD +@@ -73,7 +73,7 @@ rust_library( + visibility = ["//visibility:public"], + deps = [ + ":adapter", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) + +@@ -127,6 +127,6 @@ rust_binary( + visibility = ["//visibility:public"], + deps = [ + ":score_log_bridge", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) +diff --git a/score/mw/log/rust/score_log_bridge_cpp_init/BUILD b/score/mw/log/rust/score_log_bridge_cpp_init/BUILD +index d8d0ee5..f3e28b5 100644 +--- a/score/mw/log/rust/score_log_bridge_cpp_init/BUILD ++++ b/score/mw/log/rust/score_log_bridge_cpp_init/BUILD +@@ -51,7 +51,7 @@ rust_static_library( + visibility = ["//visibility:private"], + deps = [ + "//score/mw/log/rust/score_log_bridge", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) + From 5a1c828a7fec1efd2f30ad5e68989da0376895d1 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Fri, 25 Sep 2026 13:51:47 +0000 Subject: [PATCH 11/11] fix(logging): regenerate the baselibs migration patch for the new pin The merge with main brought in #367, which moves score_logging from c8e85fd8 to b4f272b0. The patch still applied there, but with the two Rust hunks drifting 10 and 11 lines. Regenerate it against b4f272b0 so it sits on its context exactly. No content change: the same four labels are rewritten. --- patches/logging/001-migrate-baselibs-targets.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/logging/001-migrate-baselibs-targets.patch b/patches/logging/001-migrate-baselibs-targets.patch index d34e1f0d311..fb3a27da123 100644 --- a/patches/logging/001-migrate-baselibs-targets.patch +++ b/patches/logging/001-migrate-baselibs-targets.patch @@ -12,10 +12,10 @@ index 714d0f3..ef3c4d1 100644 ], ) diff --git a/score/mw/log/rust/score_log_bridge/BUILD b/score/mw/log/rust/score_log_bridge/BUILD -index 5274d1b..ade0725 100644 +index 626ac4f..6f6b09e 100644 --- a/score/mw/log/rust/score_log_bridge/BUILD +++ b/score/mw/log/rust/score_log_bridge/BUILD -@@ -73,7 +73,7 @@ rust_library( +@@ -83,7 +83,7 @@ rust_library( visibility = ["//visibility:public"], deps = [ ":adapter", @@ -24,7 +24,7 @@ index 5274d1b..ade0725 100644 ], ) -@@ -127,6 +127,6 @@ rust_binary( +@@ -138,6 +138,6 @@ rust_binary( visibility = ["//visibility:public"], deps = [ ":score_log_bridge",