Skip to content

Commit d9ae3e6

Browse files
committed
Migration of Image FileSystem rules
Migration of QNX Image FileSystem rules from `toolchains_qnx` to `rules_imagefs`.
1 parent a5e3eab commit d9ae3e6

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.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:linux-x86_64 --config=_common

MODULE.bazel

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,17 @@ git_override(
6060
remote = "https://github.com/bmw-software-engineering/trlc.git",
6161
)
6262

63-
# Currently required for ifs tooling
64-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")
65-
66-
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency = True)
67-
toolchains_qnx.sdp(
68-
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
69-
strip_prefix = "installation",
70-
url = "https://www.qnx.com/download/download/79858/installation.tgz",
63+
bazel_dep(name = "score_rules_imagefs", version = "0.0.1")
64+
imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency=True)
65+
imagefs.toolchain(
66+
name = "score_qnx_x86_64_ifs_toolchain",
67+
target_os = "qnx",
68+
target_cpu = "x86_64",
69+
sdp_version = "8.0.0",
70+
sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
71+
type = "ifs",
72+
)
73+
use_repo(
74+
imagefs,
75+
"score_qnx_x86_64_ifs_toolchain",
7176
)
72-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
73-
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
@@ -31,4 +31,5 @@ use_repo(
3131
qcc,
3232
"score_qcc_aarch64_toolchain",
3333
"score_qcc_x86_64_toolchain",
34+
"score_qcc_x86_64_toolchain_pkg",
3435
)

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)