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 diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 8cecb8399e8..0319c2ce783 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 = "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7", + 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", @@ -37,6 +36,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", ) @@ -53,6 +53,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", ) @@ -68,6 +69,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", ) @@ -75,6 +80,10 @@ bazel_dep(name = "score_logging") git_override( module_name = "score_logging", commit = "b4f272b0a036d46fc7ff2e9a051fdec95fd23b4f", + patch_strip = 1, + patches = [ + "//patches/logging:001-migrate-baselibs-targets.patch", + ], remote = "https://github.com/eclipse-score/logging.git", ) @@ -96,6 +105,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/docs/verification_report/modules/baselibs/baselibs_verification_report.rst b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst deleted file mode 100644 index 2769de2e0e7..00000000000 --- a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst +++ /dev/null @@ -1,31 +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 -==================================== - -.. 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 - -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`. diff --git a/docs/verification_report/modules/index.rst b/docs/verification_report/modules/index.rst index 3a8496d1cb1..f9bd0015641 100644 --- a/docs/verification_report/modules/index.rst +++ b/docs/verification_report/modules/index.rst @@ -19,7 +19,7 @@ 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 ` * :doc:`Logging ` @@ -31,5 +31,5 @@ in this repository. :titlesonly: :hidden: - Baselibs + Baselibs Persistency diff --git a/known_good.json b/known_good.json index 91cca2d6ab6..f67f17a29b1 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": "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7" + "hash": "9216215f3a8468f3487884b472e1f325ef36f92b" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", @@ -35,7 +34,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 +57,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", @@ -72,7 +67,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/...", @@ -81,7 +77,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/...", @@ -105,6 +100,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": [], @@ -116,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": [ @@ -152,7 +152,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/...", @@ -171,10 +172,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/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 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", + ], 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" 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 diff --git a/patches/logging/001-migrate-baselibs-targets.patch b/patches/logging/001-migrate-baselibs-targets.patch new file mode 100644 index 00000000000..fb3a27da123 --- /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 626ac4f..6f6b09e 100644 +--- a/score/mw/log/rust/score_log_bridge/BUILD ++++ b/score/mw/log/rust/score_log_bridge/BUILD +@@ -83,7 +83,7 @@ rust_library( + visibility = ["//visibility:public"], + deps = [ + ":adapter", +- "@score_baselibs//src/log/score_log", ++ "@score_baselibs//score/log_rust/score_log", + ], + ) + +@@ -138,6 +138,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", + ], + ) + 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",