Migration of Image FileSystem rules

.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

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")

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",
+)

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",
 )

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",
     ],
 )

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",

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",
 #     ],
 # )