diff --git a/.bazelrc b/.bazelrc index 634c42d5ba9..acd6f0c860c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -37,7 +37,7 @@ build:qnx-x86_64 --incompatible_strict_action_env build:qnx-x86_64 --sandbox_writable_path=/var/tmp build:qnx-x86_64 --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0 -build:qnx-x86_64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64 +build:qnx-x86_64 --extra_toolchains=@score_qnx_x86_64_ifs_toolchain//:ifs-x86_64-qnx-sdp_8.0.0 build:qnx-x86_64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800 build:linux-x86_64 --config=_common diff --git a/MODULE.bazel b/MODULE.bazel index a9ccd471622..7b41b3d360b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -59,15 +59,3 @@ git_override( commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release remote = "https://github.com/bmw-software-engineering/trlc.git", ) - -# Currently required for ifs tooling -bazel_dep(name = "score_toolchains_qnx", version = "0.0.7") - -toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency = True) -toolchains_qnx.sdp( - sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63", - strip_prefix = "installation", - url = "https://www.qnx.com/download/download/79858/installation.tgz", -) -use_repo(toolchains_qnx, "toolchains_qnx_sdp") -use_repo(toolchains_qnx, "toolchains_qnx_ifs") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 4f91b910b36..dc5861574c5 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -41,7 +41,6 @@ "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.7/MODULE.bazel": "491f8681205e31bb57892d67442ce448cda4f472a8e6b3dc062865e29a64f89c", "https://bcr.bazel.build/modules/aspect_bazel_lib/2.8.1/MODULE.bazel": "812d2dd42f65dca362152101fbec418029cc8fd34cbad1a2fde905383d705838", "https://bcr.bazel.build/modules/aspect_bazel_lib/2.9.3/MODULE.bazel": "66baf724dbae7aff4787bf2245cc188d50cb08e07789769730151c0943587c14", - "https://bcr.bazel.build/modules/aspect_bazel_lib/2.9.4/MODULE.bazel": "ccc41028429f894b02fde7ef67d416cba3ba5084ed9ddb9bb6107aa82d118776", "https://bcr.bazel.build/modules/aspect_rules_esbuild/0.21.0/MODULE.bazel": "77dc393c43ad79398b05865444c5200c6f1aae6765615544f2c7730b5858d533", "https://bcr.bazel.build/modules/aspect_rules_esbuild/0.21.0/source.json": "062b1d3dba8adcfeb28fe60c185647f5a53ec0487ffe93cf0ae91566596e4b49", "https://bcr.bazel.build/modules/aspect_rules_js/1.33.1/MODULE.bazel": "db3e7f16e471cf6827059d03af7c21859e7a0d2bc65429a3a11f005d46fc501b", @@ -58,7 +57,6 @@ "https://bcr.bazel.build/modules/aspect_rules_lint/2.0.0/MODULE.bazel": "1f4c81edd9af0c54e65dedbe36653fc63dc9a91605313d54d5ab371f853d693c", "https://bcr.bazel.build/modules/aspect_rules_lint/2.3.0/MODULE.bazel": "4d36bce3c1347bb4fed5906877dce0e683cb207f4032711aff32334003bcf835", "https://bcr.bazel.build/modules/aspect_rules_lint/2.3.0/source.json": "07c6e7333ac089e2428a02d68deb5f90e3947aa9b9ac22c26b9e8b0083122926", - "https://bcr.bazel.build/modules/aspect_rules_py/1.0.0/MODULE.bazel": "8eb29876512d3242af50a424300bec5c5f8957b455963df5f618cb7fd4e8ae19", "https://bcr.bazel.build/modules/aspect_rules_py/1.4.0/MODULE.bazel": "6fd29b93207a31445d5d3ab9d9882fd5511e43c95e8e82e7492872663720fd44", "https://bcr.bazel.build/modules/aspect_rules_py/1.5.2/MODULE.bazel": "7e34964847c5ddf391a927a765d8b26147df5b25242f2da4fa3c4a77671383bb", "https://bcr.bazel.build/modules/aspect_rules_py/1.5.2/source.json": "020d2bd6b07210cee97226ee2215d80c4cf91e455a6702c9af1e5788d072e673", @@ -575,7 +573,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/2.7.7/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/2.8.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/2.9.3/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/2.9.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_esbuild/0.21.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_js/1.33.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_js/1.40.0/MODULE.bazel": "not found", @@ -589,7 +586,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/1.5.3/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/2.0.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/2.3.0/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_py/1.0.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_py/1.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_py/1.5.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_ts/3.6.0/MODULE.bazel": "not found", @@ -919,7 +915,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_cr_checker/0.2.2/MODULE.bazel": "dc36d9c35543db918c3fb5b93a8e684431f56c7c784cf2a1b90f35802a373c98", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_cr_checker/0.3.1/MODULE.bazel": "f49e037d7fbc0b2a8b2734fc6b47334e8cc8589ca7a5aa0f3ccca85cc5f79fac", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_cr_checker/0.3.1/source.json": "ad038d99c0e2a59cca3a7fa1aac6d87cd0d752314b65b52a91451ab0bd0f7171", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_dash_license_checker/0.1.2/MODULE.bazel": "89ba8c942dfd8d05cbf59b48868c919207aa189c670f97194078d5b8e09c6a8a", @@ -928,14 +923,14 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_format_checker/0.1.1/source.json": "e3d10be878d1a007967b75a5c6d9c3ec3d47c320685904b7f31c689b3cbcdb3a", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/source.json": "28ed0207a16f8498a84fae4983fa73060805003a4fbd68c6d749e2f1cc14601f", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rules_imagefs/0.0.1/MODULE.bazel": "1778b64b50002e31f8531bc4cc63c454eb830e769af5034825361c5d408edf68", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rules_imagefs/0.0.1/source.json": "ddb7e72bcda5e6ed3ac67d0c628c837204bb52f051fce55e349ee7c3fdc18714", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rust_policies/0.0.2/MODULE.bazel": "ade2bad4a331b02d9b7e7d9842e8de8c6fded6186486e02c4f7db5cd4b71d34d", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rust_policies/0.0.3/MODULE.bazel": "9e8310a75c13ccebc49fb9cbf7acc6c1b75654292b2ca907fb5d513133dbf6f3", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rust_policies/0.0.5/MODULE.bazel": "7de02547bdf121d3dedf5141b97f0fd9a545bd255ff5c7b699056b35816ffad9", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rust_policies/0.0.5/source.json": "22c8bf0a5cbf7c7b06f774f3f66498e0bc14346a8b2208f7427a8fbb78a42547", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_starpls_lsp/0.1.0/MODULE.bazel": "b2f8c4c8d8e851706255ff9002b448bff6e040b8f0c6adedbde2a09375aa16cc", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_starpls_lsp/0.1.0/source.json": "3c7c49977b01a990f4f0a6d65c00e75a88433af7ad21a564db338cd079a92913", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_qnx/0.0.7/MODULE.bazel": "2ae1df18803227f4edce7dfa1529ace724f60d9f6d048e20cd3aea1ae1429ba9", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_qnx/0.0.7/source.json": "31864e9f2009cab9ebb50c1afe66f65c74a905e955defe76eb1f4a5ccf12f3bd", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.4.0/MODULE.bazel": "e48f2aca62f92a44a939e1347715e7d767b647fc9f8e664e598c56d1d057ad49", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.4.0/source.json": "dcaa0e66166906ed54dc4feb28d02dda54be87b7c4018415d0d7b7190f56f5bb", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.0/MODULE.bazel": "not found", @@ -9185,49 +9180,40 @@ ] } }, - "@@score_toolchains_qnx+//:extensions.bzl%toolchains_qnx": { + "@@score_rules_imagefs+//extensions:imagefs.bzl%imagefs": { "general": { - "bzlTransitiveDigest": "F6y2fAJJUfV3b6FNSGJSyi+Pa7AqT9NG+AhWCIySUwA=", - "usagesDigest": "p/FeZwP4jiJtoCpjssuAB6imOS/izStKSk8fSVcQtTc=", + "bzlTransitiveDigest": "xJRMfKyb9krj7tW8mc7qHSmndlgVIywefmDXwdvj7kQ=", + "usagesDigest": "C+PfBCF8s2aYkpbORvNiKc7eE8FApDEgrrpZc2jYrTY=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "toolchains_qnx_sdp": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "urls": [ - "https://www.qnx.com/download/download/79858/installation.tgz" - ], - "build_file": "@@score_toolchains_qnx+//toolchains:sdp.BUILD", - "sha256": "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63", - "strip_prefix": "installation" - } - }, - "toolchains_qnx_qcc": { - "repoRuleId": "@@score_toolchains_qnx+//toolchains:rules.bzl%qcc_toolchain", + "score_qnx_x86_64_ifs_toolchain": { + "repoRuleId": "@@score_rules_imagefs+//rules/qnx:imagefs_toolchain.bzl%imagefs_toolchain", "attributes": { - "sdp_repo": "toolchains_qnx_sdp", - "qcc_version": "12.2.0", + "tc_cpu": "x86_64", + "tc_os": "qnx", + "tc_pkg_repo": "'@@score_bazel_cpp_toolchains++gcc+score_qcc_x86_64_toolchain_pkg'", "sdp_version": "8.0.0", - "qnx_version_constraint": "@@score_bazel_platforms+//:qnx8_0", - "default_license_server": "" - } - }, - "toolchains_qnx_ifs": { - "repoRuleId": "@@score_toolchains_qnx+//toolchains:rules.bzl%ifs_toolchain", - "attributes": { - "sdp_repo": "toolchains_qnx_sdp", - "qnx_version_constraint": "@@score_bazel_platforms+//:qnx8_0", - "default_license_server": "" + "tc_type": "ifs" } } }, "recordedRepoMappingEntries": [ [ - "score_toolchains_qnx+", + "", + "score_qcc_x86_64_toolchain_pkg", + "score_bazel_cpp_toolchains++gcc+score_qcc_x86_64_toolchain_pkg" + ], + [ + "score_rules_imagefs+", "bazel_tools", "bazel_tools" + ], + [ + "score_rules_imagefs+", + "score_rules_imagefs", + "score_rules_imagefs+" ] ] } diff --git a/bazel_common/score_images.MODULE.bazel b/bazel_common/score_images.MODULE.bazel index 060834fad95..32125736845 100644 --- a/bazel_common/score_images.MODULE.bazel +++ b/bazel_common/score_images.MODULE.bazel @@ -25,3 +25,19 @@ http_file( sha256 = "9ca3891b27e4b7bbf6c519d8924283e89c03b62513a988f751a3ee3d10c293e4", url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta1/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz", ) + +bazel_dep(name = "score_rules_imagefs", version = "0.0.1") + +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_version = "8.0.0", + target_cpu = "x86_64", + target_os = "qnx", + type = "ifs", +) +use_repo( + imagefs, + "score_qnx_x86_64_ifs_toolchain", +) diff --git a/bazel_common/score_qnx_toolchains.MODULE.bazel b/bazel_common/score_qnx_toolchains.MODULE.bazel index 0340dd96d69..aee7c8f7eed 100644 --- a/bazel_common/score_qnx_toolchains.MODULE.bazel +++ b/bazel_common/score_qnx_toolchains.MODULE.bazel @@ -31,4 +31,5 @@ use_repo( qcc, "score_qcc_aarch64_toolchain", "score_qcc_x86_64_toolchain", + "score_qcc_x86_64_toolchain_pkg", ) diff --git a/images/qnx_x86_64/BUILD b/images/qnx_x86_64/BUILD index b2694b26343..7f58083eb9b 100644 --- a/images/qnx_x86_64/BUILD +++ b/images/qnx_x86_64/BUILD @@ -22,12 +22,12 @@ sh_binary( name = "run", srcs = ["//runners/qemu_x86_64/scripts:run_qemu.sh"], args = [ - "$(location @toolchains_qnx_sdp//:host_dir)", + "$(location @score_qcc_x86_64_toolchain_pkg//:host_dir)", "$(location :image)", ], data = [ ":image", - "@toolchains_qnx_sdp//:host_all", - "@toolchains_qnx_sdp//:host_dir", + "@score_qcc_x86_64_toolchain_pkg//:host_all", + "@score_qcc_x86_64_toolchain_pkg//:host_dir", ], ) diff --git a/images/qnx_x86_64/build/BUILD b/images/qnx_x86_64/build/BUILD index a9aabe11678..afd5563b570 100644 --- a/images/qnx_x86_64/build/BUILD +++ b/images/qnx_x86_64/build/BUILD @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@score_toolchains_qnx//rules/fs:ifs.bzl", "qnx_ifs") +load("@score_rules_imagefs//rules/qnx:ifs.bzl", "qnx_ifs") filegroup( name = "scripts", diff --git a/runners/qemu_x86_64/BUILD b/runners/qemu_x86_64/BUILD index 9ff2afb3099..8d4663ce409 100644 --- a/runners/qemu_x86_64/BUILD +++ b/runners/qemu_x86_64/BUILD @@ -17,12 +17,12 @@ load("@score_itf//:defs.bzl", "py_itf_test") # name = "qemu_x86_64", # srcs = ["scripts/run_qemu.sh"], # args = [ -# "$(location @toolchains_qnx_sdp//:host_dir)", +# "$(location @score_qcc_x86_64_toolchain_pkg//:host_dir)", # "$(location //:image)", # ], # data = [ # "//:image", -# "@toolchains_qnx_sdp//:host_all", -# "@toolchains_qnx_sdp//:host_dir", +# "@score_qcc_x86_64_toolchain_pkg//:host_all", +# "@score_qcc_x86_64_toolchain_pkg//:host_dir", # ], # )