Skip to content
Closed
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
28 changes: 22 additions & 6 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,32 @@ build:qnx-x86_64 --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp
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

# ─── QNX aarch64 cross-compilation config ────────────────────────────────────
# ─── QNX aarch64 cross-compilation config (QNX 8.0) ─────────────────────────
# Usage: bazel build --config=qnx-aarch64 //target
build:qnx-aarch64 --config=_common
build:qnx-aarch64 --config=_qnx_common
build:qnx-aarch64 --action_env=QNXLM_LICENSE_FILE
build:qnx-aarch64 --sandbox_writable_path=/var/tmp
build:qnx-aarch64 --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_7.1.0-posix
build:qnx-aarch64 --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_7.1.0
build:qnx-aarch64 --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix
build:qnx-aarch64 --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0
build:qnx-aarch64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800

build:qnx-aarch64 --extra_toolchains=@score_qnx_aarch64_ifs_toolchain//:ifs-aarch64-qnx-sdp_8.0.0

# ─── QNX 7.1 aarch64 cross-compilation config (ProAI 8650) ───────────────────
# Usage: bazel build --config=qnx71-aarch64 //target
# Note: QNXLM_LICENSE_FILE must be set to the FLEXlm license file path or
# floating license server address before building, e.g.:
# export QNXLM_LICENSE_FILE=/path/to/license.dat # local file
# export QNXLM_LICENSE_FILE=5054@license-server # floating server
# The --action_env flag forwards this variable into Bazel sandbox actions.
build:qnx71-aarch64 --config=_common
build:qnx71-aarch64 --config=_qnx_common
build:qnx71-aarch64 --action_env=QNXLM_LICENSE_FILE
build:qnx71-aarch64 --action_env=LM_LICENSE_FILE
build:qnx71-aarch64 --sandbox_writable_path=/var/tmp
build:qnx71-aarch64 --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_7.1.0-posix
build:qnx71-aarch64 --extra_toolchains=@score_qcc_aarch64_qnx71_toolchain//:aarch64-qnx-sdp_7.1.0
build:qnx71-aarch64 --extra_toolchains=@score_qnx_aarch64_qnx71_ifs_toolchain//:ifs-aarch64-qnx-sdp_7.1.0
build:qnx71-aarch64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

shouldnt be 7.1 toolchain as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I could see only toolchain for aarch64-unknown-nto-qnx800 (QNX 8.0) present actually and no aarch64-unknown-nto-qnx710 binary for QNX 7.1 in eclipse-score/ferrocene_toolchain_builder releases. Is there any other way to address this?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

ifs for 7.1 from score_qnx_aarch64_ifs_toolchain shall be included as well, or?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Added



build:linux-x86_64 --config=_common
build:linux-x86_64 --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ __pycache__/
/.gita-workspace.csv
/build
artifacts

# QNX 7.1 SDP extracted tree — large proprietary binaries, must NOT be committed.
third_party/qnx710/archive_root/
5 changes: 3 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ module(
compatibility_level = 0,
)

local_path_override(
git_override(
module_name = "score_bazel_cpp_toolchains",
path = "third_party/score_bazel_cpp_toolchains",
commit = "9a9f063d63baf15cf634d7461968b55fa1850747",
remote = "https://github.com/qorix-group/bazel_cpp_toolchains.git",
)

# Include common modules
Expand Down
924 changes: 485 additions & 439 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions bazel_common/score_images.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ imagefs.toolchain(
imagefs.toolchain(
name = "score_qnx_aarch64_ifs_toolchain",
sdp_to_import = "@score_qcc_aarch64_toolchain_pkg",
sdp_version = "8.0.0",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

we need another one for 7.1 as well

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

added

target_cpu = "aarch64",
target_os = "qnx",
type = "ifs",
)
imagefs.toolchain(
name = "score_qnx_aarch64_qnx71_ifs_toolchain",
sdp_to_import = "@score_qcc_aarch64_qnx71_toolchain_pkg",
sdp_version = "7.1.0",
target_cpu = "aarch64",
target_os = "qnx",
Expand All @@ -48,5 +56,6 @@ imagefs.toolchain(
use_repo(
imagefs,
"score_qnx_aarch64_ifs_toolchain",
"score_qnx_aarch64_qnx71_ifs_toolchain",
"score_qnx_x86_64_ifs_toolchain",
)
5 changes: 3 additions & 2 deletions bazel_common/score_modules_tooling.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py

bazel_dep(name = "score_crates")
local_path_override(
git_override(
module_name = "score_crates",
path = "third_party/score_crates",
commit = "2f02b906f4ce53976534d4a8615ef61a504b2a1c",
remote = "https://github.com/qorix-group/score-crates.git",
)

bazel_dep(name = "score_itf")
Expand Down
17 changes: 11 additions & 6 deletions bazel_common/score_qnx_toolchains.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,22 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
qcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
qcc.sdp(
name = "score_qcc_aarch64_toolchain_pkg",
build_file = "//third_party/qnx710:qnx710_sdp.BUILD",
local_path = "/home/quan/proAI/reference_integration/third_party/qnx710/archive_root/qnx710_sdp",
)
qcc.toolchain(
name = "score_qcc_aarch64_toolchain",
sdp_version = "8.0.0",
target_cpu = "aarch64",
target_os = "qnx",
use_default_package = True,
version = "12.2.0",
)
qcc.toolchain(
name = "score_qcc_aarch64_qnx71_toolchain",
license_info_url = "",
license_info_variable = "QNXLM_LICENSE_FILE",
sdp_to_link = "score_qcc_aarch64_toolchain_pkg",
sdp_version = "7.1.0",
target_cpu = "aarch64",
target_os = "qnx",
use_default_package = True,
version = "8.3.0",
)
qcc.toolchain(
Expand All @@ -36,6 +39,8 @@ qcc.toolchain(
)
use_repo(
qcc,
"score_qcc_aarch64_qnx71_toolchain",
"score_qcc_aarch64_qnx71_toolchain_pkg",
"score_qcc_aarch64_toolchain",
"score_qcc_aarch64_toolchain_pkg",
"score_qcc_x86_64_toolchain",
Expand Down
2 changes: 1 addition & 1 deletion patches/communication/004-qnx7-discovery-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ index aecf210..0e1c345 100644
+const filesystem::Path TMP_PATH{"/var/data/tmp_discovery/mw_com_lola/service_discovery"};
// coverity[autosar_cpp14_a16_0_1_violation]
#else
// coverity[autosar_cpp14_a3_3_2_violation]
// coverity[autosar_cpp14_a3_3_2_violation]
7 changes: 4 additions & 3 deletions showcases/orchestration_persistency/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ async fn on_shutdown() -> InvokeResult {

// Configure backend with directory path (workaround: KvsBuilder::dir() not available in Rust)
// change back to dir, if https://github.com/eclipse-score/persistency/issues/222 is resolved.
let working_dir =
std::env::var("SCORE_PERSISTENCY_DIR").unwrap_or_else(|_| "/mnt/score_kvs".to_string());
let backend = JsonBackendBuilder::new().working_dir(PathBuf::from(working_dir)).build();
let working_dir = std::env::var("SCORE_PERSISTENCY_DIR").unwrap_or_else(|_| "/mnt/score_kvs".to_string());
let backend = JsonBackendBuilder::new()
.working_dir(PathBuf::from(working_dir))
.build();

let builder = KvsBuilder::new(instance_id)
.backend(Box::new(backend))
Expand Down
2 changes: 1 addition & 1 deletion showcases/standalone/ipc_bridge_send_qnx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ then
prepare_qnx_lola_tree
fi

exec /mnt/showcases/bin/ipc_bridge_cpp "$@"
exec /mnt/showcases/bin/ipc_bridge_cpp "$@"
1 change: 0 additions & 1 deletion third_party/qnx710/BUILD.bazel

This file was deleted.

70 changes: 0 additions & 70 deletions third_party/qnx710/qnx710_sdp.BUILD

This file was deleted.

15 changes: 0 additions & 15 deletions third_party/score_bazel_cpp_toolchains/.bazelrc

This file was deleted.

1 change: 0 additions & 1 deletion third_party/score_bazel_cpp_toolchains/.bazelversion

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions third_party/score_bazel_cpp_toolchains/.github/CODEOWNERS

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading