Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ test:itf-qnx-x86_64 --run_under=@score_itf//scripts:run_under_qemu

test:unit-tests --config=linux-x86_64
test:unit-tests --build_tests_only
test:unit-tests --test_tag_filters=-manual
test:unit-tests --test_tag_filters=-manual,-miri

# Coverage configuration for C++
coverage --features=coverage
Expand Down
973 changes: 427 additions & 546 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions bazel_common/score_basic_bazel.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,15 @@ bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "rules_shell", version = "0.6.0")
bazel_dep(name = "rules_cc", version = "0.2.16")
bazel_dep(name = "rules_pkg", version = "1.2.0")

# bazel_dep(name = "rules_rpm", version = "0.1.0")
# git_override(
# module_name = "rules_rpm",
# commit = "a78e559cf81754c199c926229dc6b4443e1ff149",
# remote = "https://github.com/eclipse-score/inc_os_autosd.git",
# strip_prefix = "toolchain/rpm",
# )

bazel_dep(name = "flatbuffers", version = "25.9.23")
git_override(
module_name = "flatbuffers",
commit = "187240970746d00bbd26b0f5873ed54d2477f9f3",
remote = "https://github.com/google/flatbuffers.git",
)
bazel_dep(name = "flatbuffers", version = "25.12.19")

# https://github.com/grpc/grpc-java/issues/12165
bazel_dep(name = "grpc-java", version = "1.78.0")
8 changes: 6 additions & 2 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
bazel_dep(name = "score_baselibs")
git_override(
module_name = "score_baselibs",
commit = "cab36dd7de92c282f67e78e88032e08585803528",
commit = "ce204159f37ee7815907369a8f678583bf102306",
remote = "https://github.com/eclipse-score/baselibs.git",
)

Expand Down Expand Up @@ -65,7 +65,11 @@ git_override(
bazel_dep(name = "score_lifecycle_health")
git_override(
module_name = "score_lifecycle_health",
commit = "2f2e9c4c3e6c6b38abd0b72f78c8ffb96dc7f9e8",
commit = "caf5a187c79dd93b69b524a1da61edd7c3b68ac5",
patch_strip = 1,
patches = [
"//patches/lifecycle:001-aarch64-fd-values.patch",
],
remote = "https://github.com/eclipse-score/lifecycle.git",
)

Expand Down
1 change: 1 addition & 0 deletions bazel_common/score_rust_toolchains.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ferrocene.toolchain(
"-Clink-arg=-static",
"-Clink-arg=-lm",
"-Clink-arg=-lc",
"-Clink-arg=-lgcc",
],
sha256 = "b1f1eb1146bf595fe1f4a65d5793b7039b37d2cb6d395d1c3100fa7d0377b6c9",
target_compatible_with = [
Expand Down
14 changes: 10 additions & 4 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"target_sw": {
"score_baselibs": {
"repo": "https://github.com/eclipse-score/baselibs.git",
"hash": "cab36dd7de92c282f67e78e88032e08585803528",
"hash": "ce204159f37ee7815907369a8f678583bf102306",
"metadata": {
"extra_test_config": [
"@score_baselibs//score/json:base_library=nlohmann",
Expand Down Expand Up @@ -90,9 +90,15 @@
},
"score_lifecycle_health": {
"repo": "https://github.com/eclipse-score/lifecycle.git",
"hash": "2f2e9c4c3e6c6b38abd0b72f78c8ffb96dc7f9e8",
"hash": "caf5a187c79dd93b69b524a1da61edd7c3b68ac5",
"bazel_patches": [
"//patches/lifecycle:001-aarch64-fd-values.patch"
],
"metadata": {
"code_root_path": "//src/..."
"code_root_path": "//score/...",
"exclude_test_targets": [
"//score/health_monitor/src/rust:miri_tests"
]
}
},
"score_logging": {
Expand Down Expand Up @@ -162,4 +168,4 @@
}
},
"timestamp": "2026-05-26T07:01:41+00:00Z"
}
}
13 changes: 13 additions & 0 deletions patches/lifecycle/001-aarch64-fd-values.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/score/launch_manager/src/daemon/src/osal/ipc_comms.hpp b/score/launch_manager/src/daemon/src/osal/ipc_comms.hpp
index 725dc62b..a1b2c3d4 100644
--- a/score/launch_manager/src/daemon/src/osal/ipc_comms.hpp
+++ b/score/launch_manager/src/daemon/src/osal/ipc_comms.hpp
@@ -70,7 +70,7 @@ struct IpcCommsSync final
/// @brief Constant for the synchronization file descriptor.
/// The `sync_fd` is a constant representing the file descriptor used for synchronization
/// during communication. It is set to a value of 3 by default.
- static const int sync_fd = 3;
+ static const int sync_fd = 111;

/// @brief Constant for the file descriptor used to signal state transitions
/// The semaphore used to signal state transitions is stored in an unlinked shared memory area. This requires
Empty file added patches/lifecycle/BUILD
Empty file.
2 changes: 1 addition & 1 deletion rust_coverage/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ rust_coverage_report(
"linux-x86_64",
"ferrocene-coverage",
],
query = 'kind("rust_test", @score_lifecycle_health//src/...)',
query = 'kind("rust_test", @score_lifecycle_health//score/...) -@score_lifecycle_health//score/health_monitor/src/rust:miri_tests',
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 3 additions & 1 deletion showcases/simple_lifecycle/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ load("//bazel_common:bundlers.bzl", "score_pkg_bundle")
launch_manager_config(
name = "lifecycle_configs",
config = "//showcases/simple_lifecycle/configs:launch_manager_config.json",
flatbuffer_out_dir = "etc",
)

score_pkg_bundle(
name = "simple_lifecycle",
bins = [
"@score_lifecycle_health//src/launch_manager_daemon:launch_manager",
"@score_lifecycle_health//score/launch_manager:launch_manager",
"@score_lifecycle_health//examples/cpp_supervised_app",
"@score_lifecycle_health//examples/rust_supervised_app",
"@score_lifecycle_health//examples/control_application:control_daemon",
Expand All @@ -33,5 +34,6 @@ score_pkg_bundle(
],
custom_layout = {
":lifecycle_configs": "etc/",
"//showcases/simple_lifecycle/configs:logging.json": "etc/logging.json",
},
)
1 change: 1 addition & 0 deletions showcases/simple_lifecycle/configs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
# *******************************************************************************
exports_files([
"launch_manager_config.json",
"logging.json",
])
6 changes: 6 additions & 0 deletions showcases/simple_lifecycle/configs/logging.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"appId": "LM",
"logLevel": "kDebug",
"logLevelThresholdConsole": "kInfo",
"logMode": "kConsole"
}
Loading