Skip to content
Merged
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
6 changes: 4 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ build:linux-x86_64 --config=_common
build:linux-x86_64 --config=unified

build:eb-aarch64 --config=_common
build:eb-aarch64 --extra_toolchains=@score_ebclfsa_toolchain//:aarch64-linux-sdk_2.0.0-beta2-ebclfsa
build:eb-aarch64 --extra_toolchains=@score_ebclfsa_toolchain//:aarch64-linux-sdk_2.0.0-beta3-ebclfsa
build:eb-aarch64 --extra_toolchains=@ferrocene_aarch64_ebclfsa//:rust_ferrocene_toolchain
build:eb-aarch64 --platforms=@score_bazel_platforms//:aarch64-linux-sdk_2.0.0-beta2-ebclfsa
build:eb-aarch64 --platforms=@score_bazel_platforms//:aarch64-linux-sdk_2.0.0-beta3-ebclfsa

build:autosd-x86_64 --config=_common
build:autosd-x86_64 --force_pic
# AutoSD supplies its own link flags and has no static libstdc++.
build:autosd-x86_64 --features=-default_link_flags
Comment thread
odra marked this conversation as resolved.
Resolved
build:autosd-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux-autosd10
build:autosd-x86_64 --extra_toolchains=@score_autosd10_x86_64_toolchain//:x86_64-linux-autosd10

Expand Down
692 changes: 662 additions & 30 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bazel_common/score_gcc_toolchains.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", de
gcc.toolchain(
name = "score_ebclfsa_toolchain",
runtime_ecosystem = "ebclfsa",
sdk_version = "2.0.0-beta2",
sdk_version = "2.0.0-beta3",
target_cpu = "aarch64",
target_os = "linux",
use_default_package = True,
Expand Down
4 changes: 2 additions & 2 deletions bazel_common/score_images.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_

http_file(
name = "eb_corbos_toolkit_fastdev_archive",
sha256 = "e5eb75be5a9f4bbe219b06dc9d010012796495ba3cf31b4f21adc7dd14888409",
url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta2/fastdev-trixie-ebclfsa-ebcl-qemuarm64.tar.gz",
sha256 = "d84ffd33210a71a2fdd478fa25df3775f873a83d2fe158b56c5ed37da4265823",
url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta3/fastdev-trixie-ebclfsa-ebcl-qemuarm64.tar.gz",
)

bazel_dep(name = "score_rules_imagefs", version = "0.1.0")
Expand Down
4 changes: 2 additions & 2 deletions bazel_common/score_modules_tooling.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ git_override(
bazel_dep(name = "score_bazel_platforms")
git_override(
module_name = "score_bazel_platforms",
commit = "607672cdf2f05f21af7113dab0849726dd59bf86",
commit = "081dcf7bdbc94d05bbe354291e13a775dbf8f3e6",
remote = "https://github.com/eclipse-score/bazel_platforms.git",
)

Expand Down Expand Up @@ -83,6 +83,6 @@ git_override(
bazel_dep(name = "score_bazel_cpp_toolchains")
git_override(
module_name = "score_bazel_cpp_toolchains",
commit = "bd12c5344053f842fae4623dada5716dfb43e61d",
commit = "3dd3caa94354e44310172607d5e9223cf914ea76",
remote = "https://github.com/eclipse-score/bazel_cpp_toolchains.git",
)
5 changes: 5 additions & 0 deletions docs/integration_process/step_4_platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ CI check.
`images/ebclfsa_aarch64/README.md <https://github.com/eclipse-score/reference_integration/blob/main/images/ebclfsa_aarch64/README.md>`_
before targeting it.

The ``autosd-x86_64`` Bazel configuration uses the AutoSD SDK's package-specific
link flags instead of the toolchain's generic Linux ``default_link_flags``.
The generic flags request static ``libstdc++``, which the AutoSD SDK does not
provide; AutoSD binaries must link against the SDK's shared C++ runtime.

Run any image locally in QEMU
-----------------------------

Expand Down
6 changes: 3 additions & 3 deletions images/ebclfsa_aarch64/build/build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ for src in "${DEPLOY_SRCS[@]}"; do
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost "rm -f /$(basename "$src")"
done

# Shutdown QEMU via SSH
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost sync
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true
# Enable root login and empty passwords for integration testing, not for production use.
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost "printf 'PermitRootLogin yes\nPermitEmptyPasswords yes\nPasswordAuthentication yes\n' > /etc/ssh/sshd_config.d/99-integration-test.conf"
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost "sed -i 's/^root:[^:]*:/root::/' /etc/shadow && sync && crinit-ctl poweroff" || true

# Wait for QEMU process to finish
if [[ -f "$WORKING_DIR/qemu.pid" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
"score_bazel_platforms": {
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
"docs": false,
"hash": "607672cdf2f05f21af7113dab0849726dd59bf86"
"hash": "081dcf7bdbc94d05bbe354291e13a775dbf8f3e6"
},
"score_test_scenarios": {
"repo": "https://github.com/eclipse-score/testing_tools.git",
Expand All @@ -316,7 +316,7 @@
"score_bazel_cpp_toolchains": {
"repo": "https://github.com/eclipse-score/bazel_cpp_toolchains.git",
"docs": false,
"hash": "bd12c5344053f842fae4623dada5716dfb43e61d",
"hash": "3dd3caa94354e44310172607d5e9223cf914ea76",
"metadata": {
"code_root_path": "//score/...",
"extra_test_config": [],
Expand Down
Loading