diff --git a/.bazelrc b/.bazelrc index 48b177fec6..d7288ea9bd 100644 --- a/.bazelrc +++ b/.bazelrc @@ -30,7 +30,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-posix -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:itf-qnx-x86_64 --config=qnx-x86_64 diff --git a/MODULE.bazel b/MODULE.bazel index b6ea37b719..521a098bd4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -53,12 +53,31 @@ git_override( ) # 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", +# 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") +bazel_dep(name = "score_rules_imagefs", version = "0.0.1") +git_override( + module_name = "score_rules_imagefs", + remote = "https://github.com/eclipse-score/rules_imagefs.git", + commit = "9507e5bb2bc247e570014fc713c512f10d5f87cc", +) +imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency=True) +imagefs.toolchain( + name = "score_qnx_x86_64_ifs_toolchain", + target_os = "qnx", + target_cpu = "x86_64", + sdp_version = "8.0.0", + sdp_to_import = "@score_qcc_x86_64_toolchain_pkg", + type = "ifs", +) +use_repo( + imagefs, + "score_qnx_x86_64_ifs_toolchain", ) -use_repo(toolchains_qnx, "toolchains_qnx_sdp") -use_repo(toolchains_qnx, "toolchains_qnx_ifs") diff --git a/bazel_common/score_qnx_toolchains.MODULE.bazel b/bazel_common/score_qnx_toolchains.MODULE.bazel index 4ff05dd7a0..fcd988ba4e 100644 --- a/bazel_common/score_qnx_toolchains.MODULE.bazel +++ b/bazel_common/score_qnx_toolchains.MODULE.bazel @@ -22,4 +22,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/BUILD b/images/qnx_x86_64/build/BUILD index 1ec2e2d81b..dc98731a6d 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",