From e2a6c53f202620f83d69e20565f888a18bc72c6c Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 27 Aug 2026 15:39:41 +0000 Subject: [PATCH] Build the code with the Ebclfsa 2.0.0-beta2 SDK --- .bazelrc | 4 +- MODULE.bazel.lock | 64 ++++++++++++------- .../score_gcc_toolchains.MODULE.bazel | 7 +- bazel_common/score_images.MODULE.bazel | 4 +- .../score_modules_tooling.MODULE.bazel | 2 +- images/ebclfsa_aarch64/build/BUILD | 10 +-- 6 files changed, 58 insertions(+), 33 deletions(-) diff --git a/.bazelrc b/.bazelrc index f00a26c8437..855aa500ccb 100644 --- a/.bazelrc +++ b/.bazelrc @@ -70,9 +70,9 @@ build:linux-x86_64 --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux build:linux-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix build:eb-aarch64 --config=_common -build:eb-aarch64 --extra_toolchains=@score_ebclfsa_toolchain//:aarch64-linux-sdk_0.1.0-ebclfsa +build:eb-aarch64 --extra_toolchains=@score_ebclfsa_toolchain//:aarch64-linux-sdk_2.0.0-beta2-ebclfsa build:eb-aarch64 --extra_toolchains=@ferrocene_aarch64_ebclfsa//:rust_ferrocene_toolchain -build:eb-aarch64 --platforms=@score_bazel_platforms//:aarch64-linux-sdk_0.1.0-ebclfsa +build:eb-aarch64 --platforms=@score_bazel_platforms//:aarch64-linux-sdk_2.0.0-beta2-ebclfsa build:autosd-x86_64 --config=_common build:autosd-x86_64 --force_pic diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 8b3ee03d415..5c6e236506b 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -316,6 +316,7 @@ "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/MODULE.bazel": "b3925269f63561b8b880ae7cf62ccf81f6ece55b62cd791eda9925147ae116ec", "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/source.json": "da1cb1add160f5e5074b7272e9db6fd8f1b3336c15032cd0a653af9d2f484aed", "https://bcr.bazel.build/modules/package_metadata/0.0.2/MODULE.bazel": "fb8d25550742674d63d7b250063d4580ca530499f045d70748b1b142081ebb92", + "https://bcr.bazel.build/modules/package_metadata/0.0.3/MODULE.bazel": "77890552ecea9e284b5424c9de827a58099348763a4359e975c359a83d4faa83", "https://bcr.bazel.build/modules/package_metadata/0.0.6/MODULE.bazel": "341dab6f417197494517d54c8e557c0baee1de7aec83543a4fbefe57900acb7e", "https://bcr.bazel.build/modules/package_metadata/0.0.7/MODULE.bazel": "7adb03933fc8401f495800cf4eafcff0edc6da0ff55c7db223ef69d19f689486", "https://bcr.bazel.build/modules/package_metadata/0.0.7/source.json": "50639625e937b56115012674c797cca7a05a96b4878c87d803c13dc2b31de8a0", @@ -328,7 +329,8 @@ "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d", "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc", "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580", - "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96", + "https://bcr.bazel.build/modules/platforms/1.1.0/MODULE.bazel": "1c0c09f5bdcf4b3f924720d2478a3711cb39f4977019ca5988685e5b7e18b3d2", + "https://bcr.bazel.build/modules/platforms/1.1.0/source.json": "fcf351c47596c939140ab0d333dfdd08ed1ea6ce33c2fe70c12493a301cf1344", "https://bcr.bazel.build/modules/prometheus-cpp/1.2.4/MODULE.bazel": "0fbe5dcff66311947a3f6b86ebc6a6d9328e31a28413ca864debc4a043f371e5", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/MODULE.bazel": "ce82e086bbc0b60267e970f6a54b2ca6d0f22d3eb6633e00e2cc2899c700f3d8", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/source.json": "8cb66b4e535afc718e9d104a3db96ccb71a42ee816a100e50fd0d5ac843c0606", @@ -800,6 +802,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentelemetry-proto/1.4.0.bcr.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentracing-cpp/1.6.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.2/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.3/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.6/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.7/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.10/MODULE.bazel": "not found", @@ -811,6 +814,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.8/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.9/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/1.0.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/1.1.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/prometheus-cpp/1.2.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/prometheus-cpp/1.3.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/protobuf/21.7/MODULE.bazel": "not found", @@ -992,8 +996,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/MODULE.bazel": "5f14457f9b708302db05b5dc3c07bd41ae19b91cabf98a0dbffdca622bd6ac91", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/source.json": "2946be24c6b978aa788c934643aa7ec68aac4a926bea4eaa81d512fd48e9f4a8", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/source.json": "ef316fad71fdbd53daf43fc0a82fbc7c293908a2712214ff79134c177d028024", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", @@ -9778,8 +9780,8 @@ }, "@@score_bazel_cpp_toolchains+//extensions:gcc.bzl%gcc": { "general": { - "bzlTransitiveDigest": "dc5MfL+KgiCba7Ie+8RFXMg+QaVnnCWXSXUymx//0GY=", - "usagesDigest": "oxmc9zqxQOnppJnClchkYp6riYfqmi0+TBKIbpEW7SM=", + "bzlTransitiveDigest": "738T673EzrKd6mA7b5ErdBk/KwtVxl0DEtZ2QvFlfzE=", + "usagesDigest": "6wJHOVwvvysQfKoIGr5K2N7osZUeHQhoi7mUp8yb83g=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -9791,6 +9793,7 @@ "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/v0.0.4/x86_64-unknown-linux-gnu_gcc12.tar.gz" ], "build_file": "@@score_bazel_cpp_toolchains+//packages/linux/x86_64/gcc/12.2.0:gcc.BUILD", + "patch_cmds": [], "sha256": "e9b9a7a63a5f8271b76d6e2057906b95c7a244e4931a8e10edeaa241e9f7c11e", "strip_prefix": "x86_64-unknown-linux-gnu" } @@ -9799,21 +9802,25 @@ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "urls": [ - "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta1/fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz" + "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta2/fastdev-sdk-trixie-ebclfsa-ebcl-qemuarm64.tar.gz" ], - "build_file": "@@score_bazel_cpp_toolchains+//packages/linux/aarch64/ebclfsa/0.1.0:ebclfsa.BUILD", - "sha256": "f44286c28d831dc40acdac08ef49f38a2e9cbb057bea38c25834964693785287", - "strip_prefix": "fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64" + "build_file": "@@score_bazel_cpp_toolchains+//packages/linux/aarch64/ebclfsa/2.0.0-beta2:ebclfsa.BUILD", + "patch_cmds": [ + "sdk=$(pwd); loader=$sdk/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2; test -x \"$loader\" -a -x \"$sdk/usr/bin/patchelf\" || exit 1; tmp=$(mktemp -d); cp \"$sdk/usr/bin/patchelf\" \"$tmp/patchelf\"; run_patchelf() { \"$loader\" --library-path \"$sdk/usr/lib/x86_64-linux-gnu:$sdk/lib/x86_64-linux-gnu\" \"$tmp/patchelf\" \"$@\"; }; for binary in $(find usr/bin usr/sbin usr/libexec/gcc* usr/lib/gcc-cross usr/lib/llvm-*/bin -type f -perm -u+x 2>/dev/null); do interpreter=$(run_patchelf --print-interpreter \"$binary\" 2>/dev/null) || continue; test -n \"$interpreter\" || continue; run_patchelf --set-interpreter \"$loader\" \"$binary\" >/dev/null 2>&1 || true; done; rm -rf \"$tmp\"" + ], + "sha256": "4cf7f0191988795f316f276b56e370ad60fc371954a881d158ebba0284d9d3f5", + "strip_prefix": "fastdev-sdk-trixie-ebclfsa-ebcl-qemuarm64" } }, "score_autosd10_x86_64_toolchain_pkg": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "urls": [ - "https://github.com/eclipse-score/inc_os_autosd/releases/download/continuous/autosd-toolchain-x86_64.tar.gz" + "https://github.com/eclipse-score/os_autosd/releases/download/v0.0.2/autosd-toolchain-x86_64.tar.gz" ], "build_file": "@@score_bazel_cpp_toolchains+//packages/linux/x86_64/autosd/10.0:autosd.BUILD", - "sha256": "39091c500a31bc58d5934cc9c27f5fec4326f30d8bff88fe67737c86385bf39f", + "patch_cmds": [], + "sha256": "25991056bd29d4cb37b11e42d0c09f55dc61d0b9d703f75d854cf614f688c96f", "strip_prefix": "sysroot" } }, @@ -9824,6 +9831,7 @@ "https://www.qnx.com/download/download/79858/installation.tgz" ], "build_file": "@@score_bazel_cpp_toolchains+//packages/qnx/aarch64/sdp/8.0.0:sdp.BUILD", + "patch_cmds": [], "sha256": "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63", "strip_prefix": "installation" } @@ -9835,6 +9843,7 @@ "https://www.qnx.com/download/download/79858/installation.tgz" ], "build_file": "@@score_bazel_cpp_toolchains+//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD", + "patch_cmds": [], "sha256": "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63", "strip_prefix": "installation" } @@ -9845,6 +9854,8 @@ "extra_compile_flags": [], "extra_c_compile_flags": [], "extra_cxx_compile_flags": [], + "extra_known_features": [], + "extra_enabled_features": [], "extra_link_flags": [], "license_info_variable": "", "license_info_value": "", @@ -9871,9 +9882,11 @@ "extra_c_compile_flags": [ "-nostdinc", "-isystem", - "external/%{toolchain_pkg}%/usr/lib/gcc-cross/aarch64-linux-gnu/13/include", + "external/%{toolchain_pkg}%/usr/lib/gcc-cross/aarch64-linux-gnu/14/include", "-isystem", "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include", + "-isystem", + "external/%{toolchain_pkg}%/usr/include/aarch64-linux-gnu", "-L", "external/%{toolchain_pkg}%/lib/aarch64-linux-gnu", "-L", @@ -9885,16 +9898,18 @@ "extra_cxx_compile_flags": [ "-nostdinc++", "-isystem", - "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/13", + "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/14", "-isystem", - "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/13/aarch64-linux-gnu", + "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/14/aarch64-linux-gnu", "-isystem", - "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/13/backward", + "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include/c++/14/backward", "-nostdinc", "-isystem", - "external/%{toolchain_pkg}%/usr/lib/gcc-cross/aarch64-linux-gnu/13/include", + "external/%{toolchain_pkg}%/usr/lib/gcc-cross/aarch64-linux-gnu/14/include", "-isystem", "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/include", + "-isystem", + "external/%{toolchain_pkg}%/usr/include/aarch64-linux-gnu", "-L", "external/%{toolchain_pkg}%/lib/aarch64-linux-gnu", "-L", @@ -9903,6 +9918,8 @@ "external/%{toolchain_pkg}%/usr/lib/x86_64-linux-gnu", "--no-canonical-prefixes" ], + "extra_known_features": [], + "extra_enabled_features": [], "extra_link_flags": [ "-B", "external/%{toolchain_pkg}%/usr/aarch64-linux-gnu/bin", @@ -9923,14 +9940,11 @@ "license_info_variable": "", "license_info_value": "", "license_path": "/opt/score_qnx/license/licenses", - "sdk_version": "0.1.0", + "sdk_version": "2.0.0-beta2", "sdp_version": "", - "tc_compiler_library_search_paths": [ - "external/%{toolchain_pkg}%/usr/lib/x86_64-linux-gnu", - "external/%{toolchain_pkg}%/lib/x86_64-linux-gnu" - ], + "tc_compiler_library_search_paths": [], "tc_cpu": "aarch64", - "tc_identifier": "sdk_0.1.0", + "tc_identifier": "sdk_2.0.0-beta2", "tc_os": "linux", "tc_pkg_repo": "score_ebclfsa_toolchain_pkg", "tc_system_toolchain": false, @@ -9966,6 +9980,8 @@ "-isystem", "external/%{toolchain_pkg}%/usr/include" ], + "extra_known_features": [], + "extra_enabled_features": [], "extra_link_flags": [ "-B", "external/%{toolchain_pkg}%/usr/bin", @@ -10008,6 +10024,8 @@ "extra_compile_flags": [], "extra_c_compile_flags": [], "extra_cxx_compile_flags": [], + "extra_known_features": [], + "extra_enabled_features": [], "extra_link_flags": [], "license_info_variable": "", "license_info_value": "", @@ -10033,6 +10051,8 @@ "extra_compile_flags": [], "extra_c_compile_flags": [], "extra_cxx_compile_flags": [], + "extra_known_features": [], + "extra_enabled_features": [], "extra_link_flags": [], "license_info_variable": "", "license_info_value": "", diff --git a/bazel_common/score_gcc_toolchains.MODULE.bazel b/bazel_common/score_gcc_toolchains.MODULE.bazel index 47a3c5f7a2d..2d5249e860f 100644 --- a/bazel_common/score_gcc_toolchains.MODULE.bazel +++ b/bazel_common/score_gcc_toolchains.MODULE.bazel @@ -12,6 +12,11 @@ # ******************************************************************************* bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.4") +git_override( + module_name = "score_bazel_cpp_toolchains", + commit = "6d33a7b951d0c86f8fa8d2214af4562b27965d8f", + remote = "https://github.com/eclipse-score/bazel_cpp_toolchains.git", +) gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True) gcc.toolchain( @@ -24,7 +29,7 @@ gcc.toolchain( gcc.toolchain( name = "score_ebclfsa_toolchain", runtime_ecosystem = "ebclfsa", - sdk_version = "0.1.0", + sdk_version = "2.0.0-beta2", target_cpu = "aarch64", target_os = "linux", use_default_package = True, diff --git a/bazel_common/score_images.MODULE.bazel b/bazel_common/score_images.MODULE.bazel index 38cd721e690..6b79fc38b71 100644 --- a/bazel_common/score_images.MODULE.bazel +++ b/bazel_common/score_images.MODULE.bazel @@ -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 = "9ca3891b27e4b7bbf6c519d8924283e89c03b62513a988f751a3ee3d10c293e4", - url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta1/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz", + sha256 = "e5eb75be5a9f4bbe219b06dc9d010012796495ba3cf31b4f21adc7dd14888409", + url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta2/fastdev-trixie-ebclfsa-ebcl-qemuarm64.tar.gz", ) bazel_dep(name = "score_rules_imagefs", version = "0.0.1") diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 643c3a62376..f68ac64dda1 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -45,7 +45,7 @@ git_override( bazel_dep(name = "score_bazel_platforms") git_override( module_name = "score_bazel_platforms", - commit = "82b6df6ce93fb2960c52d992939fc6c3cf0e1f0f", + commit = "d28800eb66c7e574891e5d4f2ea3119694f50487", remote = "https://github.com/eclipse-score/bazel_platforms.git", ) diff --git a/images/ebclfsa_aarch64/build/BUILD b/images/ebclfsa_aarch64/build/BUILD index 11b211e6757..b5d66fbafe6 100644 --- a/images/ebclfsa_aarch64/build/BUILD +++ b/images/ebclfsa_aarch64/build/BUILD @@ -16,10 +16,10 @@ genrule( name = "extract-fastdev-image", srcs = ["@eb_corbos_toolkit_fastdev_archive//file"], outs = [ - "ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic", - "ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux", + "ebcl-qemuarm64/fastdev-trixie-ebclfsa-ebcl-qemuarm64.wic", + "ebcl-qemuarm64/fastdev-trixie-ebclfsa-ebcl-qemuarm64-vmlinux", ], - cmd = "tar xzf $(location @eb_corbos_toolkit_fastdev_archive//file) -C $(RULEDIR)/ebcl-qemuarm64 && chmod +w $(RULEDIR)/ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic && ls -lah $(RULEDIR)/ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic > /tmp/foo", + cmd = "tar xzf $(location @eb_corbos_toolkit_fastdev_archive//file) -C $(RULEDIR)/ebcl-qemuarm64 && chmod +w $(RULEDIR)/ebcl-qemuarm64/fastdev-trixie-ebclfsa-ebcl-qemuarm64.wic && ls -lah $(RULEDIR)/ebcl-qemuarm64/fastdev-trixie-ebclfsa-ebcl-qemuarm64.wic > /tmp/foo", visibility = [ "//visibility:public", ], @@ -54,8 +54,8 @@ genrule( "build_image.sh", ], outs = [ - "ebcl-qemuarm64-deployed/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic", - "ebcl-qemuarm64-deployed/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux", + "ebcl-qemuarm64-deployed/fastdev-trixie-ebclfsa-ebcl-qemuarm64.wic", + "ebcl-qemuarm64-deployed/fastdev-trixie-ebclfsa-ebcl-qemuarm64-vmlinux", ], cmd = " \ $(location build_image.sh) \