Skip to content

Commit afd28eb

Browse files
committed
WIP: Migration of Image FileSystem rules
Migration of QNX Image FileSystem rules from `toolchains_qnx` to `rules_imagefs`.
1 parent ee2e3b6 commit afd28eb

4 files changed

Lines changed: 30 additions & 10 deletions

File tree

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ build:qnx-x86_64 --incompatible_strict_action_env
3030
build:qnx-x86_64 --sandbox_writable_path=/var/tmp
3131
build:qnx-x86_64 --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
3232
build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0-posix
33-
build:qnx-x86_64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
33+
build:qnx-x86_64 --extra_toolchains=@score_qnx_x86_64_ifs_toolchain//:ifs-x86_64-qnx-sdp_8.0.0
3434
build:qnx-x86_64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
3535

3636
build:itf-qnx-x86_64 --config=qnx-x86_64

MODULE.bazel

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,31 @@ git_override(
5353
)
5454

5555
# Currently required for ifs tooling
56-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")
57-
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency=True)
58-
toolchains_qnx.sdp(
59-
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
60-
strip_prefix = "installation",
61-
url = "https://www.qnx.com/download/download/79858/installation.tgz",
56+
# bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")
57+
# toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency=True)
58+
# toolchains_qnx.sdp(
59+
# sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
60+
# strip_prefix = "installation",
61+
# url = "https://www.qnx.com/download/download/79858/installation.tgz",
62+
# )
63+
# use_repo(toolchains_qnx, "toolchains_qnx_sdp")
64+
# use_repo(toolchains_qnx, "toolchains_qnx_ifs")
65+
bazel_dep(name = "score_rules_imagefs", version = "0.0.1")
66+
git_override(
67+
module_name = "score_rules_imagefs",
68+
remote = "https://github.com/eclipse-score/rules_imagefs.git",
69+
commit = "9507e5bb2bc247e570014fc713c512f10d5f87cc",
70+
)
71+
imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency=True)
72+
imagefs.toolchain(
73+
name = "score_qnx_x86_64_ifs_toolchain",
74+
target_os = "qnx",
75+
target_cpu = "x86_64",
76+
sdp_version = "8.0.0",
77+
sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
78+
type = "ifs",
79+
)
80+
use_repo(
81+
imagefs,
82+
"score_qnx_x86_64_ifs_toolchain",
6283
)
63-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
64-
use_repo(toolchains_qnx, "toolchains_qnx_ifs")

bazel_common/score_qnx_toolchains.MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ use_repo(
2222
qcc,
2323
"score_qcc_aarch64_toolchain",
2424
"score_qcc_x86_64_toolchain",
25+
"score_qcc_x86_64_toolchain_pkg",
2526
)

images/qnx_x86_64/build/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
load("@score_toolchains_qnx//rules/fs:ifs.bzl", "qnx_ifs")
14+
load("@score_rules_imagefs//rules/qnx:ifs.bzl", "qnx_ifs")
1515

1616
filegroup(
1717
name = "scripts",

0 commit comments

Comments
 (0)