Skip to content

Commit 8038ca2

Browse files
authored
Migration of Image FileSystem rules (eclipse-score#107)
Migration of QNX Image FileSystem rules from `toolchains_qnx` to `rules_imagefs`.
1 parent f65f17c commit 8038ca2

File tree

8 files changed

+47
-56
lines changed

8 files changed

+47
-56
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ build:qnx-x86_64 --incompatible_strict_action_env
3737
build:qnx-x86_64 --sandbox_writable_path=/var/tmp
3838
build:qnx-x86_64 --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
3939
build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0
40-
build:qnx-x86_64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
40+
build:qnx-x86_64 --extra_toolchains=@score_qnx_x86_64_ifs_toolchain//:ifs-x86_64-qnx-sdp_8.0.0
4141
build:qnx-x86_64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
4242

4343
build:linux-x86_64 --config=_common

MODULE.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,3 @@ git_override(
5959
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
6060
remote = "https://github.com/bmw-software-engineering/trlc.git",
6161
)
62-
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",
71-
)
72-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
73-
use_repo(toolchains_qnx, "toolchains_qnx_ifs")

MODULE.bazel.lock

Lines changed: 22 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel_common/score_images.MODULE.bazel

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,19 @@ http_file(
2525
sha256 = "9ca3891b27e4b7bbf6c519d8924283e89c03b62513a988f751a3ee3d10c293e4",
2626
url = "https://github.com/Elektrobit/eb_corbos_toolkit/releases/download/v2.0.0-beta1/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz",
2727
)
28+
29+
bazel_dep(name = "score_rules_imagefs", version = "0.0.1")
30+
31+
imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency = True)
32+
imagefs.toolchain(
33+
name = "score_qnx_x86_64_ifs_toolchain",
34+
sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
35+
sdp_version = "8.0.0",
36+
target_cpu = "x86_64",
37+
target_os = "qnx",
38+
type = "ifs",
39+
)
40+
use_repo(
41+
imagefs,
42+
"score_qnx_x86_64_ifs_toolchain",
43+
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ sh_binary(
2222
name = "run",
2323
srcs = ["//runners/qemu_x86_64/scripts:run_qemu.sh"],
2424
args = [
25-
"$(location @toolchains_qnx_sdp//:host_dir)",
25+
"$(location @score_qcc_x86_64_toolchain_pkg//:host_dir)",
2626
"$(location :image)",
2727
],
2828
data = [
2929
":image",
30-
"@toolchains_qnx_sdp//:host_all",
31-
"@toolchains_qnx_sdp//:host_dir",
30+
"@score_qcc_x86_64_toolchain_pkg//:host_all",
31+
"@score_qcc_x86_64_toolchain_pkg//:host_dir",
3232
],
3333
)

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

runners/qemu_x86_64/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ load("@score_itf//:defs.bzl", "py_itf_test")
1717
# name = "qemu_x86_64",
1818
# srcs = ["scripts/run_qemu.sh"],
1919
# args = [
20-
# "$(location @toolchains_qnx_sdp//:host_dir)",
20+
# "$(location @score_qcc_x86_64_toolchain_pkg//:host_dir)",
2121
# "$(location //:image)",
2222
# ],
2323
# data = [
2424
# "//:image",
25-
# "@toolchains_qnx_sdp//:host_all",
26-
# "@toolchains_qnx_sdp//:host_dir",
25+
# "@score_qcc_x86_64_toolchain_pkg//:host_all",
26+
# "@score_qcc_x86_64_toolchain_pkg//:host_dir",
2727
# ],
2828
# )

0 commit comments

Comments
 (0)