Skip to content

Commit db0dd5b

Browse files
opajonkopajonk
authored
Updated EB corbos Linux Assets (#54)
With these new asses a few spurious error messages which could happen during the VM bootup / shutdown are gone.
1 parent f3644b6 commit db0dd5b

File tree

5 files changed

+31
-45
lines changed

5 files changed

+31
-45
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/persistency_integration/BUILD‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ genrule(
1616
name = "fetch-fastdev-archive",
1717
srcs = [],
1818
outs = ["fastdev-archive.tgz"],
19-
cmd = "wget -O $@ https://github.com/Elektrobit/eclipse-score_toolchains_gcc/releases/download/0.5.0-alpha/fastdev-ubuntu-ebcl-deb-qemu-arm64.tgz"
19+
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"
2020
)
2121

2222
genrule(
2323
name = "fastdev-image",
2424
srcs = [":fetch-fastdev-archive"],
2525
outs = [
26-
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
27-
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
26+
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
27+
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
2828
],
2929
cmd = "tar xzf $(location :fetch-fastdev-archive) -C $(RULEDIR)",
3030
)
@@ -38,9 +38,9 @@ genrule(
3838
"run_qemu.sh",
3939
],
4040
cmd = " \
41-
mkdir -p $(RULEDIR)/deb-qemuarm64-modified &&\
42-
cp $(RULEDIR)/deb-qemuarm64/* $(RULEDIR)/deb-qemuarm64-modified/ &&\
43-
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
41+
mkdir -p $(RULEDIR)/ebcl-qemuarm64-modified &&\
42+
cp $(RULEDIR)/ebcl-qemuarm64/* $(RULEDIR)/ebcl-qemuarm64-modified/ &&\
43+
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
4444
sleep 30 ; \
4545
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_persistency//tests/cpp_test_scenarios:cpp_test_scenarios) root@localhost:/usr/bin/cpp_tests_persistency &&\
4646
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location scripts/cpp_tests_persistency.sh) root@localhost:/usr/bin/cpp_tests_persistency.sh &&\
@@ -50,20 +50,20 @@ genrule(
5050
",
5151
outs = [
5252
"qemu_upload.log",
53-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
54-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
53+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
54+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
5555
],
5656
)
5757

5858
genrule(
5959
name = "run",
6060
srcs = [
61-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
62-
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux",
61+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
62+
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux",
6363
"run_qemu.sh"
6464
],
6565
cmd = " \
66-
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
66+
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
6767
sleep 10 ; \
6868
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost cpp_tests_persistency.sh > $(RULEDIR)/ssh_persistency_test_scenarios_run.log && \
6969
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true \

‎ebclfsa/persistency_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 //persistency_integration:fastdev-image\" first to fetch the image"
1414
fi

‎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

0 commit comments

Comments
 (0)