Skip to content
Draft
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
237 changes: 50 additions & 187 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion bazel_common/docs_bundles.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

# Generated from known_good.json at 2026-11-13T14:08:13Z
# Generated from known_good.json at 2026-11-17T10:28:38Z
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py --known known_good.json --output-dir-modules bazel_common

# Documentation bundle mounts for the docs() macro in the root BUILD file.
Expand Down Expand Up @@ -40,6 +40,10 @@ DOCS_BUNDLES = [
"bundle": "@score_time//:docs_bundle",
"mount_at": "modules/score_time",
},
{
"bundle": "@score_crypto//:docs_bundle",
"mount_at": "modules/score_crypto",
},
{
"bundle": "@score_itf//:docs_bundle",
"mount_at": "process_methods_tools/score_itf",
Expand Down
17 changes: 16 additions & 1 deletion bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

# Generated from known_good.json at 2026-11-13T14:08:13Z
# Generated from known_good.json at 2026-11-17T10:28:38Z
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py --known known_good.json --output-dir-modules bazel_common

bazel_dep(name = "score_baselibs")
Expand Down Expand Up @@ -55,6 +55,10 @@ single_version_override(
bazel_dep(name = "score_kyron")
single_version_override(
module_name = "score_kyron",
patch_strip = 1,
patches = [
"//patches/kyron:001-pin-flatbuffers-to-integration-version.patch",
],
version = "0.1.6",
)

Expand Down Expand Up @@ -98,6 +102,17 @@ single_version_override(
version = "0.3.2",
)

bazel_dep(name = "score_crypto")
git_override(
module_name = "score_crypto",
commit = "0568b709cafd7e956cb65b287153b90c38815f05",
patch_strip = 1,
patches = [
"//patches/crypto:001-bazel-cpp-toolchains-1.1-qnx-sdp-pkg.patch",
],
remote = "https://github.com/etas-contrib/score_crypto.git",
)

bazel_dep(name = "score_config_management")
single_version_override(
module_name = "score_config_management",
Expand Down
7 changes: 4 additions & 3 deletions bazel_common/score_modules_tooling.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

# Generated from known_good.json at 2026-11-13T14:08:13Z
# Generated from known_good.json at 2026-11-17T10:28:38Z
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py --known known_good.json --output-dir-modules bazel_common

bazel_dep(name = "score_crates")
single_version_override(
git_override(
module_name = "score_crates",
version = "0.0.15",
commit = "871234431b05bc99b249fb5db775bbe850ed7f0d",
remote = "https://github.com/eclipse-score/score-crates.git",
)

bazel_dep(name = "score_itf")
Expand Down
2 changes: 1 addition & 1 deletion bazel_common/score_python.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
bazel_dep(name = "rules_python", version = "1.8.3")
bazel_dep(name = "rules_python", version = "1.9.0")

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trial update to 1.9.0 will come with score-crates update.

bazel_dep(name = "aspect_rules_py", version = "1.5.2")

PYTHON_VERSION = "3.12"
Expand Down
25 changes: 25 additions & 0 deletions bazel_common/score_test_artifact_versions.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,28 @@ single_version_override(
module_name = "score_toolchains_rust",
version = "0.10.0",
)

# Workaround: libpfm 4.11.0.bcr.1 (pulled in by google_benchmark 1.9.5) downloads from the defunct
# netcologne.dl.sourceforge.net mirror; 4.11.0.bcr.2 uses downloads.sourceforge.net.
bazel_dep(name = "libpfm", version = "4.11.0.bcr.2")

# score_crypto builds soft_hsm with rules_foreign_cc's cmake rule, which does not know the
# QNX target OS (CMAKE_SYSTEM_NAME "QNX"). Overrides of non-root modules are ignored, so the patch
# has to be applied from here.
bazel_dep(name = "rules_foreign_cc", version = "0.16.0")
single_version_override(
module_name = "rules_foreign_cc",
patch_strip = 1,
patches = ["//patches/rules_foreign_cc:001-qnx-cmake-system-name.patch"],
version = "0.16.0",
)

# score_openssl 0.2.1 fails to build for glibc targets whose toolchain passes -D_XOPEN_SOURCE=700
# (e.g. AutoSD): syscall() and madvise() are hidden in crypto/mem_sec.c. Main adds -D_GNU_SOURCE
# (eclipse-score/openssl#16). Drop once that is part of a release.
bazel_dep(name = "score_openssl")
git_override(
module_name = "score_openssl",
commit = "89e1591f40a82fde66b3850a8a7a385db630f8a9",
remote = "https://github.com/eclipse-score/openssl.git",
)
29 changes: 27 additions & 2 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
},
"score_kyron": {
"repo": "https://github.com/eclipse-score/kyron.git",
"bazel_patches": [
"//patches/kyron:001-pin-flatbuffers-to-integration-version.patch"
],
"metadata": {
"code_root_path": "//src/...",
"extra_test_config": [],
Expand Down Expand Up @@ -236,6 +239,28 @@
]
}
},
"score_crypto": {
"repo": "https://github.com/etas-contrib/score_crypto.git",
"hash": "0568b709cafd7e956cb65b287153b90c38815f05",
"bazel_patches": [
"//patches/crypto:001-bazel-cpp-toolchains-1.1-qnx-sdp-pkg.patch"
],
"metadata": {
"code_root_path": "//score/...",
"extra_test_config": [],
"exclude_test_targets": [],
"langs": [
"cpp",
"rust"
],
"rust_coverage_config": "ferrocene-coverage",
"test_args": [
"--config=x86_64-linux",
"//score/..."
]
},
"pin_version": true
},
"score_config_management": {
"repo": "https://github.com/eclipse-score/config_management.git",
"docs": false,
Expand Down Expand Up @@ -277,7 +302,7 @@
"score_crates": {
"repo": "https://github.com/eclipse-score/score-crates.git",
"docs": false,
"version": "0.0.15"
"hash": "871234431b05bc99b249fb5db775bbe850ed7f0d"
},
"score_itf": {
"repo": "https://github.com/eclipse-score/itf.git",
Expand Down Expand Up @@ -358,5 +383,5 @@
"score_time"
]
},
"timestamp": "2026-11-13T14:08:13Z"
"timestamp": "2026-11-17T10:28:38Z"
}
63 changes: 63 additions & 0 deletions patches/crypto/001-bazel-cpp-toolchains-1.1-qnx-sdp-pkg.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 180bbe8..7c8c94a 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -63,7 +63,7 @@ bazel_dep(name = "rules_cc", version = "0.2.22")
# *******************************************************************************
bazel_dep(
name = "score_bazel_cpp_toolchains",
- version = "1.0.5",
+ version = "1.1.0-rc2",
dev_dependency = True,
)

@@ -105,7 +105,7 @@ gcc.toolchain(
# *******************************************************************************
gcc.toolchain(
name = "score_qcc_x86_64_toolchain",
- sdp_version = "8.0.4",
+ sdp_version = "8.0.5",
target_cpu = "x86_64",
target_os = "qnx",
use_default_package = True,
@@ -117,7 +117,7 @@ gcc.toolchain(
# *******************************************************************************
gcc.toolchain(
name = "score_qcc_aarch64_toolchain",
- sdp_version = "8.0.4",
+ sdp_version = "8.0.5",
target_cpu = "aarch64",
target_os = "qnx",
use_default_package = True,
@@ -125,12 +125,11 @@ gcc.toolchain(
)
use_repo(
gcc,
+ "qnx_sdp_8_0_5_pkg",
"score_gcc_aarch64_toolchain",
"score_gcc_x86_64_toolchain",
"score_qcc_aarch64_toolchain",
- "score_qcc_aarch64_toolchain_pkg",
"score_qcc_x86_64_toolchain",
- "score_qcc_x86_64_toolchain_pkg",
)

# *******************************************************************************
@@ -177,7 +176,7 @@ bazel_dep(name = "score_rules_imagefs", version = "0.0.3", dev_dependency = True
imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency = True)
imagefs.toolchain(
name = "score_qnx_x86_64_ifs_toolchain",
- sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
+ sdp_to_import = "@qnx_sdp_8_0_5_pkg",
sdp_version = "8.0.0",
target_cpu = "x86_64",
target_os = "qnx",
@@ -185,7 +184,7 @@ imagefs.toolchain(
)
imagefs.toolchain(
name = "score_qnx_aarch64_ifs_toolchain",
- sdp_to_import = "@score_qcc_aarch64_toolchain_pkg",
+ sdp_to_import = "@qnx_sdp_8_0_5_pkg",
sdp_version = "8.0.0",
target_cpu = "aarch64",
target_os = "qnx",
18 changes: 18 additions & 0 deletions patches/crypto/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# *******************************************************************************
# 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
# *******************************************************************************
exports_files(
[
"001-bazel-cpp-toolchains-1.1-qnx-sdp-pkg.patch",
],
visibility = ["//visibility:public"],
)
17 changes: 17 additions & 0 deletions patches/kyron/001-pin-flatbuffers-to-integration-version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -28,6 +28,13 @@
bazel_dep(name = "score_docs_as_code", version = "8.0.1")
bazel_dep(name = "score_tooling", version = "2.2.1")

+# score_tooling's flatbuffers 25.9.23 reaches rules_foreign_cc via grpc 1.70.1, opencensus-cpp and
+# google_benchmark 1.8.4. reference_integration resolves flatbuffers 25.12.19.bcr.1 (grpc 1.76.0), which does not.
+# module_tests.py only reads the module's original mod graph and does not yet iterate to apply the

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PiotrKorkus not sure if this is the first occurrence, but here we have a case where the final module mod graph is differing from the initial.

Such a disappearing dependency is probably the case which will lead to a failure a missing override via module_test.py stays most likely silent. Do we have a follow up issue to introduce this recursive check?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+# --override_module pins according to the final graph, so it would pin rules_foreign_cc, which
+# Bazel then rejects as an override on a nonexistent module. Raising flatbuffers here removes that edge.
+bazel_dep(name = "flatbuffers", version = "25.12.19.bcr.1", dev_dependency = True)
+
# LLVM source-based coverage pipeline: the qualified S-CORE coverage tool,
# successor of @score_tooling//coverage. See tools/coverage/.
bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True)
10 changes: 10 additions & 0 deletions patches/rules_foreign_cc/001-qnx-cmake-system-name.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/foreign_cc/private/cmake_script.bzl
+++ b/foreign_cc/private/cmake_script.bzl
@@ -20,6 +20,7 @@
"ios": "iOS",
"linux": "Linux",
"macos": "Darwin",
+ "qnx": "QNX",
"tvos": "tvOS",
"watchos": "watchOS",
}
18 changes: 18 additions & 0 deletions patches/rules_foreign_cc/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# *******************************************************************************
# 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
# *******************************************************************************
exports_files(
[
"001-qnx-cmake-system-name.patch",
],
visibility = ["//visibility:public"],
)
2 changes: 2 additions & 0 deletions showcases/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ score_pkg_bundle(
"//showcases/standalone:time_pkg_files",
"//showcases/standalone:logging_pkg_files",
"//showcases/standalone:config_management_pkg_files",
"//showcases/standalone:crypto_pkg_files",
"//showcases/standalone:persistency_pkg_files",
"//showcases/simple_lifecycle:simple_lifecycle_pkg_files",
"//showcases/drive_replay:drive_replay_pkg_files",
Expand Down Expand Up @@ -54,6 +55,7 @@ pkg_filegroup(
"//showcases/standalone:baselibs_pkg_files",
"//showcases/standalone:comm_pkg_files",
"//showcases/standalone:config_management_pkg_files",
"//showcases/standalone:crypto_pkg_files",
"//showcases/standalone:kyron_pkg_files",
"//showcases/standalone:logging_pkg_files",
"//showcases/standalone:persistency_pkg_files",
Expand Down
12 changes: 12 additions & 0 deletions showcases/standalone/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,15 @@ score_pkg_bundle(
},
package_dir = "standalone",
)

# Build-only bundle: it is part of the showcases solely to make sure the crypto
# daemon and cryptoki get built for QNX, which would otherwise not be verified
# in the integration. Running them is a follow-up activity.
score_pkg_bundle(
name = "crypto",
bins = [
"@score_crypto//score/crypto/src/daemon:crypto_daemon",
"@score_crypto//score/cryptoki:cryptoki_cdylib",
],
package_dir = "standalone",
)
Loading