Skip to content

Commit 3542588

Browse files
kgraeperopajonk
kgraeper
authored and
opajonk
committed
Updated EB corbos Linux Assets
With these new asses a few spurious error messages which could happen during the VM bootup / shutdown are gone.
1 parent e2aabe8 commit 3542588

File tree

6 files changed

+46
-40
lines changed

6 files changed

+46
-40
lines changed

‎ebclfsa/MODULE.bazel‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,14 @@ bazel_dep(name = "score_toolchains_gcc", dev_dependency=True)
2525
git_override( # Elektrobit corbos Linux for Safety Applications needs a specific toolchain
2626
module_name = "score_toolchains_gcc",
2727
remote = "https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc.git",
28-
tag = "0.5.0-alpha", # commit sha: fb009e490b9b8f28805d587f50d0bf6d885f3414
28+
tag = "0.5.0-beta" # corresponds to git sha 158921ffd9aabef41a2a03bca5baeaa9f4aa9d33
2929
)
30-
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency=True)
30+
gcc = use_extension("@score_toolchains_gcc//extensions:gcc.bzl", "gcc", dev_dependency=True)
3131
gcc.toolchain(
32-
url = "https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc/releases/download/0.5.0-alpha/fastdev-sdk-ubuntu-ebcl-deb-qemu-arm64.tar.xz",
33-
sha256 = "cf8d277a2b95bbdad3e177c488fa77d01723510690a911218ef33747574d78fe",
34-
strip_prefix = "fastdev-sdk-ubuntu-ebcl-deb-qemuarm64",
32+
url = "https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc/releases/download/0.5.0-beta/fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz",
33+
sha256 = "05b57bbc8d99d46df6b57f774c39a5a2664964ea7eb94147cbece08508c1f121",
34+
strip_prefix = "fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64",
3535
)
36-
37-
# TODO to be moved to toolchain. https://github.com/eclipse-score/toolchains_gcc/issues/11
38-
gcc.extra_features(
39-
features = [
40-
"minimal_warnings",
41-
"treat_warnings_as_errors",
42-
],
43-
)
44-
gcc.warning_flags(
45-
minimal_warnings = ["-Wall", "-Wno-error=deprecated-declarations"],
46-
strict_warnings = ["-Wextra", "-Wpedantic"],
47-
treat_warnings_as_errors = ["-Werror"],
48-
)
49-
5036
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
5137

5238
bazel_dep(name = "score_docs_as_code", version = "2.0.1") # part of 0.5.0-alpha release

‎ebclfsa/scrample_integration/BUILD‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ genrule(
5252
name = "fetch-fastdev-archive",
5353
srcs = [],
5454
outs = ["fastdev-archive.tgz"],
55-
cmd = "wget -O $@ https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc/releases/download/0.5.0-alpha/fastdev-ubuntu-ebcl-deb-qemu-arm64.tgz"
55+
cmd = "wget -O $@ https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc/releases/download/0.5.0-beta/fastdev-ubuntu-ebcl-deb-qemu-arm64.tgz"
5656
)
5757

5858
genrule(
5959
name = "fastdev-image",
6060
srcs = [":fetch-fastdev-archive"],
6161
outs = [
62-
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
63-
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
62+
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
63+
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
6464
],
6565
cmd = "tar xzf $(location :fetch-fastdev-archive) -C $(RULEDIR)",
6666
)
@@ -77,9 +77,9 @@ genrule(
7777
"run_qemu.sh",
7878
],
7979
cmd = " \
80-
mkdir -p $(RULEDIR)/deb-qemuarm64-modified &&\
81-
cp $(RULEDIR)/deb-qemuarm64/* $(RULEDIR)/deb-qemuarm64-modified/ &&\
82-
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
80+
mkdir -p $(RULEDIR)/ebcl-qemuarm64-modified &&\
81+
cp $(RULEDIR)/ebcl-qemuarm64/* $(RULEDIR)/ebcl-qemuarm64-modified/ &&\
82+
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
8383
sleep 30 ; \
8484
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location :scrample_sil) root@localhost:/usr/bin &&\
8585
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_scrample//src:scrample) root@localhost:/usr/bin &&\
@@ -92,20 +92,20 @@ genrule(
9292
",
9393
outs = [
9494
"qemu_upload.log",
95-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
96-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
95+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
96+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
9797
],
9898
)
9999

100100
genrule(
101101
name = "run",
102102
srcs = [
103-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
104-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux",
103+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
104+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux",
105105
"run_qemu.sh"
106106
],
107107
cmd = " \
108-
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
108+
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
109109
sleep 10 ; \
110110
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost scrample -n 10 -m send -t 200 -s /etc/mw_com_config.json > $(RULEDIR)/ssh_scrample_run.log && \
111111
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true \

‎ebclfsa/scrample_integration/run_qemu.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [ -z "$1" ]; then
77
exit 1
88
fi
99
BASEFOLDER=$1
10-
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64.wic"
11-
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
10+
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic"
11+
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
1212
if [ ! -d "${BASEFOLDER}" ] || [ ! -f "${IMAGE}" ] || [ ! -f "${KERNEL}" ] ; then
1313
echo "Run \"bazel build --config=aarch64-ebclfsa //scrample_integration:fastdev-image\" first to fetch the image"
1414
fi

‎integration_test.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ declare -A BUILD_TARGET_GROUPS=(
2020
#[score_logging]="@score_logging//src/..."
2121
[score_orchestrator]="@score_orchestrator//src/..."
2222
[score_test_scenarios]="@score_test_scenarios//..."
23-
[score_feo]="@score_feo//..."
23+
[score_feo]="-- @score_feo//... -@score_feo//:docs -@score_feo//:ide_support -@score_feo//:needs_json"
2424
)
2525

2626
# Parse command line arguments
@@ -115,11 +115,11 @@ for group in "${!BUILD_TARGET_GROUPS[@]}"; do
115115
# Log build group banner only to stdout/stderr (not into summary table file)
116116
echo "--- Building group: ${group} ---"
117117
start_ts=$(date +%s)
118-
echo "bazel build --config "${CONFIG}" ${targets} --verbose_failures"
118+
echo "bazel build --verbose_failures --config "${CONFIG}" ${targets}"
119119
# GitHub Actions log grouping start
120120
echo "::group::Bazel build (${group})"
121121
set +e
122-
bazel build --config "${CONFIG}" ${targets} --verbose_failures 2>&1 | tee "$log_file"
122+
bazel build --verbose_failures --config "${CONFIG}" ${targets} 2>&1 | tee "$log_file"
123123
build_status=${PIPESTATUS[0]}
124124
# Track if any build group failed
125125
if [[ ${build_status} -ne 0 ]]; then

‎known_good.json‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,39 @@
33
"modules": {
44
"score_baselibs": {
55
"version": "0.1.3",
6+
"hash": "9457533471c8f0d4a1bb9435e91ff12c62d19c7c",
67
"repo": "https://github.com/eclipse-score/baselibs.git",
78
"branch": "s_core_release_v0_5_0"
89
},
910
"score_communication": {
1011
"version": "0.1.1",
1112
"repo": "https://github.com/eclipse-score/communication.git",
13+
"hash": "24d6e8916b89dbb405eae0b082348645d190dc18",
1214
"branch": "s_core_release_v0_5_0"
1315
},
1416
"score_persistency": {
1517
"version": "0.2.1",
18+
"hash": "7548876ed3e40ec3f3053c57634de68129287e05",
1619
"repo": "https://github.com/eclipse-score/persistency.git"
1720
},
1821
"score_orchestrator": {
1922
"version": "0.0.3",
23+
"hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6",
2024
"repo": "https://github.com/eclipse-score/orchestrator.git"
2125
},
26+
"score_kyron": {
27+
"hash": "caa9c0b367d18a09e969c1353e95a8c443ae896b",
28+
"repo": "https://github.com/eclipse-score/kyron.git"
29+
},
30+
"score_feo": {
31+
"version": "1.0.2",
32+
"hash": "4841281ab81aad114cfc86a19a69c029a274f28d",
33+
"repo": "https://github.com/eclipse-score/feo.git",
34+
"branch": "candidate_v0.5"
35+
},
2236
"score_tooling": {
2337
"version": "1.0.2",
38+
"hash": "64f81aaf9378e93be5209e52bf1bd149d6d7727f",
2439
"repo": "https://github.com/eclipse-score/tooling.git"
2540
},
2641
"score_platform": {
@@ -29,24 +44,23 @@
2944
},
3045
"score_bazel_platforms": {
3146
"version": "0.0.2",
47+
"hash": "0115193f958e8e592168df1e29cf86174bdba761",
3248
"repo": "https://github.com/eclipse-score/bazel_platforms.git"
3349
},
3450
"score_test_scenarios": {
3551
"version": "0.3.0",
52+
"hash": "a2f9cded3deb636f5dc800bf7a47131487119721",
3653
"repo": "https://github.com/eclipse-score/testing_tools.git"
3754
},
3855
"score_docs_as_code": {
3956
"version": "2.0.1",
57+
"hash": "bb52c96dd98799bdce68c166ad3b826f017f7cf6",
4058
"repo": "https://github.com/eclipse-score/docs-as-code.git"
4159
},
4260
"score_process": {
4361
"version": "1.3.1",
62+
"hash": "270e0ed0a2e560340f02b2f7046752cc937fe251",
4463
"repo": "https://github.com/eclipse-score/process_description.git"
45-
},
46-
"score_feo": {
47-
"version": "1.0.2",
48-
"repo": "https://github.com/eclipse-score/feo.git",
49-
"branch": "candidate_v0.5"
5064
}
5165
},
5266
"manifest_sha256": "4c9b7f...",

‎score_modules.MODULE.bazel‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,9 @@ single_version_override(
7777
version = "1.0.2",
7878
)
7979

80+
bazel_dep(name = "score_kyron")
81+
git_override(
82+
module_name = "score_kyron",
83+
remote = "https://github.com/eclipse-score/kyron.git",
84+
commit = "c5837ac6612a5ebf91cd016775f2d3ee85ed6892",
85+
)

0 commit comments

Comments
 (0)