Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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:linux-x86_64 --config=_common
Expand Down
22 changes: 13 additions & 9 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,18 @@ git_override(
remote = "https://github.com/bmw-software-engineering/trlc.git",
)

# Currently required for ifs tooling
bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")
bazel_dep(name = "score_rules_imagefs", version = "0.0.1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


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",
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",
)
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
use_repo(toolchains_qnx, "toolchains_qnx_ifs")
1,460 changes: 1,312 additions & 148 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bazel_common/score_qnx_toolchains.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ use_repo(
qcc,
"score_qcc_aarch64_toolchain",
"score_qcc_x86_64_toolchain",
"score_qcc_x86_64_toolchain_pkg",
)
6 changes: 3 additions & 3 deletions images/qnx_x86_64/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion images/qnx_x86_64/build/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions runners/qemu_x86_64/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
# ],
# )