Skip to content

Commit 91e5475

Browse files
antonkriantonkri
authored
Merge pull request #15 from eclipse-score/ankr_add_scrample_app
integrate scrample app
2 parents bea0e62 + 78a94b1 commit 91e5475

File tree

8 files changed

+161
-3
lines changed

8 files changed

+161
-3
lines changed

‎qnx_qemu/.bazelrc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
22
common --registry=https://bcr.bazel.build
33

4+
build:_common --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
5+
build:_common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
6+
build:_common --@score_baselibs//score/json:base_library=nlohmann
7+
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
8+
build:_common --@score_communication//score/mw/com/flags:tracing_library=stub
9+
build:_common --cxxopt=-Wno-error=mismatched-new-delete
10+
11+
build:x86_64-qnx --config=_common
412
build:x86_64-qnx --noexperimental_merged_skyframe_analysis_execution
513
build:x86_64-qnx --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
614
build:x86_64-qnx --incompatible_enable_cc_toolchain_resolution

‎qnx_qemu/MODULE.bazel‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ module(
1616
compatibility_level = 0,
1717
)
1818

19-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.1")
19+
bazel_dep(name = "score_toolchains_qnx", version = "0.0.2")
20+
git_override(
21+
module_name = "score_toolchains_qnx",
22+
commit = "faa88ee7b26c82b23127b4493f140c15df4c7b8d",
23+
remote = "https://github.com/eclipse-score/toolchains_qnx.git",
24+
)
2025

2126

2227
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx")
@@ -86,3 +91,36 @@ bazel_dep(name = "rules_cc", version = "0.1.1")
8691
#
8792
###############################################################################
8893
bazel_dep(name = "score_itf", version = "0.1.0")
94+
95+
bazel_dep(name = "score_baselibs", version = "0.1.3")
96+
97+
bazel_dep(name = "score_communication", version = "0.0.1")
98+
git_override(
99+
module_name = "score_communication",
100+
commit = "2d0d067b064a6e27d115f382bc938a30d44f08e7",
101+
remote = "https://github.com/eclipse-score/communication.git",
102+
)
103+
104+
bazel_dep(name = "scrample", version = "0.0.1")
105+
git_override(
106+
module_name = "scrample",
107+
commit = "a56570127abc583ad6127f27bae31ae3643b2eb9",
108+
remote = "https://github.com/eclipse-score/scrample.git",
109+
)
110+
111+
112+
113+
bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost")
114+
archive_override(
115+
module_name = "rules_boost",
116+
urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
117+
strip_prefix = "rules_boost-master",
118+
)
119+
120+
# TRLC dependency for requirements traceability
121+
bazel_dep(name = "trlc", version = "0.0.0")
122+
git_override(
123+
module_name = "trlc",
124+
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
125+
remote = "https://github.com/bmw-software-engineering/trlc.git",
126+
)

‎qnx_qemu/build/BUILD‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,13 @@ qnx_ifs(
4949
"system.build",
5050
":scripts",
5151
":configs",
52+
"@scrample//src:scrample",
53+
"//scrample_integration:etc_configs",
5254
],
55+
ext_repo_maping = {
56+
"SCRAMPLE_PATH": "$(location @scrample//src:scrample)",
57+
},
5358
visibility = [
5459
"//:__pkg__"
5560
],
56-
)
61+
)

‎qnx_qemu/build/system.build‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,9 @@ pci/pci_debug2.so # Enhanced PCI debugging support
274274
[uid=0 gid=0 perms=400] /var/ssh/ssh_host_rsa_key.pub = configs/ssh_host_rsa_key.pub # SSH server public key
275275

276276
# DHCP client configuration
277-
[perms=644] /etc/dhcpcd.conf = configs/dhcpcd.conf # DHCP client configuration file
277+
[perms=644] /etc/dhcpcd.conf = configs/dhcpcd.conf # DHCP client configuration file
278+
279+
[perms=777] /etc/logging.json = scrample_integration/etc/logging.json # DHCP client configuration file
280+
[perms=777] /etc/mw_com_config.json = scrample_integration/etc/mw_com_config.json # DHCP client configuration file
281+
282+
[perms=777] /scrample = ${SCRAMPLE_PATH}

‎qnx_qemu/configs/startup.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,8 @@ else
7777
echo "Default hostname set to: Qnx_S-core"
7878
fi
7979

80+
echo "---> adding /tmp_discovery folder"
81+
mkdir -p /tmp_ram/tmp_discovery
82+
ln -sP /tmp_ram/tmp_discovery /tmp_discovery
83+
8084
/proc/boot/sshd -f /var/ssh/sshd_config # Start SSH daemon with specified configuration file

‎qnx_qemu/scrample_integration/BUILD‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# *******************************************************************************
2+
# Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
#
4+
# See the NOTICE file(s) distributed with this work for additional
5+
# information regarding copyright ownership.
6+
#
7+
# This program and the accompanying materials are made available under the
8+
# terms of the Apache License Version 2.0 which is available at
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# SPDX-License-Identifier: Apache-2.0
12+
# *******************************************************************************
13+
14+
15+
exports_files([
16+
"etc/logging.json",
17+
"etc/mw_com_config.json",
18+
])
19+
20+
filegroup(
21+
name = "etc_configs",
22+
srcs = [
23+
"etc/logging.json",
24+
"etc/mw_com_config.json",
25+
],
26+
visibility = ["//visibility:public"],
27+
)

‎qnx_qemu/scrample_integration/etc/logging.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"appId": "IPBR",
3+
"appDesc": "ipc_bridge",
4+
"logLevel": "kDebug",
5+
"logLevelThresholdConsole": "kInfo",
6+
"logMode": "kConsole",
7+
"dynamicDatarouterIdentifiers" : true
8+
}

‎qnx_qemu/scrample_integration/etc/mw_com_config.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"serviceTypes": [
3+
{
4+
"serviceTypeName": "/score/MapApiLanesStamped",
5+
"version": {
6+
"major": 1,
7+
"minor": 0
8+
},
9+
"bindings": [
10+
{
11+
"binding": "SHM",
12+
"serviceId": 6432,
13+
"events": [
14+
{
15+
"eventName": "map_api_lanes_stamped",
16+
"eventId": 1
17+
},
18+
{
19+
"eventName": "dummy_data_stamped",
20+
"eventId": 2
21+
}
22+
]
23+
}
24+
]
25+
}
26+
],
27+
"serviceInstances": [
28+
{
29+
"instanceSpecifier": "score/MapApiLanesStamped",
30+
"serviceTypeName": "/score/MapApiLanesStamped",
31+
"version": {
32+
"major": 1,
33+
"minor": 0
34+
},
35+
"instances": [
36+
{
37+
"instanceId": 1,
38+
"allowedConsumer": {
39+
"QM": [
40+
4002,
41+
0
42+
]
43+
},
44+
"allowedProvider": {
45+
"QM": [
46+
4001,
47+
0
48+
]
49+
},
50+
"asil-level": "QM",
51+
"binding": "SHM",
52+
"events": [
53+
{
54+
"eventName": "map_api_lanes_stamped",
55+
"numberOfSampleSlots": 10,
56+
"maxSubscribers": 3
57+
}
58+
]
59+
}
60+
]
61+
}
62+
]
63+
}

0 commit comments

Comments
 (0)