Skip to content
Merged
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
24 changes: 5 additions & 19 deletions ebclfsa/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,14 @@ bazel_dep(name = "score_toolchains_gcc", dev_dependency=True)
git_override( # Elektrobit corbos Linux for Safety Applications needs a specific toolchain
module_name = "score_toolchains_gcc",
remote = "https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc.git",
tag = "0.5.0-alpha", # commit sha: fb009e490b9b8f28805d587f50d0bf6d885f3414
tag = "0.5.0-beta" # corresponds to git sha 158921ffd9aabef41a2a03bca5baeaa9f4aa9d33
)
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency=True)
gcc = use_extension("@score_toolchains_gcc//extensions:gcc.bzl", "gcc", dev_dependency=True)
gcc.toolchain(
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",
sha256 = "cf8d277a2b95bbdad3e177c488fa77d01723510690a911218ef33747574d78fe",
strip_prefix = "fastdev-sdk-ubuntu-ebcl-deb-qemuarm64",
url = "https://github.com/elektrobit-contrib/eclipse-score_toolchains_gcc/releases/download/0.5.0-beta/fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64.tar.gz",
sha256 = "05b57bbc8d99d46df6b57f774c39a5a2664964ea7eb94147cbece08508c1f121",
strip_prefix = "fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64",
)

# TODO to be moved to toolchain. https://github.com/eclipse-score/toolchains_gcc/issues/11
gcc.extra_features(
features = [
"minimal_warnings",
"treat_warnings_as_errors",
],
)
gcc.warning_flags(
minimal_warnings = ["-Wall", "-Wno-error=deprecated-declarations"],
strict_warnings = ["-Wextra", "-Wpedantic"],
treat_warnings_as_errors = ["-Werror"],
)

use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")

bazel_dep(name = "score_docs_as_code", version = "2.0.1") # part of 0.5.0-alpha release
Expand Down
22 changes: 11 additions & 11 deletions ebclfsa/persistency_integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ genrule(
name = "fetch-fastdev-archive",
srcs = [],
outs = ["fastdev-archive.tgz"],
cmd = "wget -O $@ https://github.com/Elektrobit/eclipse-score_toolchains_gcc/releases/download/0.5.0-alpha/fastdev-ubuntu-ebcl-deb-qemu-arm64.tgz"
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"
)

genrule(
name = "fastdev-image",
srcs = [":fetch-fastdev-archive"],
outs = [
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
],
cmd = "tar xzf $(location :fetch-fastdev-archive) -C $(RULEDIR)",
)
Expand All @@ -38,9 +38,9 @@ genrule(
"run_qemu.sh",
],
cmd = " \
mkdir -p $(RULEDIR)/deb-qemuarm64-modified &&\
cp $(RULEDIR)/deb-qemuarm64/* $(RULEDIR)/deb-qemuarm64-modified/ &&\
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
mkdir -p $(RULEDIR)/ebcl-qemuarm64-modified &&\
cp $(RULEDIR)/ebcl-qemuarm64/* $(RULEDIR)/ebcl-qemuarm64-modified/ &&\
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
sleep 30 ; \
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 &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location scripts/cpp_tests_persistency.sh) root@localhost:/usr/bin/cpp_tests_persistency.sh &&\
Expand All @@ -50,20 +50,20 @@ genrule(
",
outs = [
"qemu_upload.log",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
],
)

genrule(
name = "run",
srcs = [
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux",
"run_qemu.sh"
],
cmd = " \
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
sleep 10 ; \
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost cpp_tests_persistency.sh > $(RULEDIR)/ssh_persistency_test_scenarios_run.log && \
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true \
Expand Down
4 changes: 2 additions & 2 deletions ebclfsa/persistency_integration/run_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [ -z "$1" ]; then
exit 1
fi
BASEFOLDER=$1
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64.wic"
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic"
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
if [ ! -d "${BASEFOLDER}" ] || [ ! -f "${IMAGE}" ] || [ ! -f "${KERNEL}" ] ; then
echo "Run \"bazel build --config=aarch64-ebclfsa //persistency_integration:fastdev-image\" first to fetch the image"
fi
Expand Down
22 changes: 11 additions & 11 deletions ebclfsa/scrample_integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ genrule(
name = "fetch-fastdev-archive",
srcs = [],
outs = ["fastdev-archive.tgz"],
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"
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"
)

genrule(
name = "fastdev-image",
srcs = [":fetch-fastdev-archive"],
outs = [
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
],
cmd = "tar xzf $(location :fetch-fastdev-archive) -C $(RULEDIR)",
)
Expand All @@ -77,9 +77,9 @@ genrule(
"run_qemu.sh",
],
cmd = " \
mkdir -p $(RULEDIR)/deb-qemuarm64-modified &&\
cp $(RULEDIR)/deb-qemuarm64/* $(RULEDIR)/deb-qemuarm64-modified/ &&\
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
mkdir -p $(RULEDIR)/ebcl-qemuarm64-modified &&\
cp $(RULEDIR)/ebcl-qemuarm64/* $(RULEDIR)/ebcl-qemuarm64-modified/ &&\
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
sleep 30 ; \
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location :scrample_sil) root@localhost:/usr/bin &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_scrample//src:scrample) root@localhost:/usr/bin &&\
Expand All @@ -92,20 +92,20 @@ genrule(
",
outs = [
"qemu_upload.log",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
],
)

genrule(
name = "run",
srcs = [
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64.wic",
"deb-qemuarm64-modified/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic",
"ebcl-qemuarm64-modified/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux",
"run_qemu.sh"
],
cmd = " \
$(location run_qemu.sh) $(RULEDIR)/deb-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_run.log &\
sleep 10 ; \
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 && \
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true \
Expand Down
4 changes: 2 additions & 2 deletions ebclfsa/scrample_integration/run_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [ -z "$1" ]; then
exit 1
fi
BASEFOLDER=$1
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64.wic"
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebcl-deb-qemuarm64-vmlinux"
IMAGE="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64.wic"
KERNEL="${BASEFOLDER}/fastdev-ubuntu-ebclfsa-ebcl-qemuarm64-vmlinux"
if [ ! -d "${BASEFOLDER}" ] || [ ! -f "${IMAGE}" ] || [ ! -f "${KERNEL}" ] ; then
echo "Run \"bazel build --config=aarch64-ebclfsa //scrample_integration:fastdev-image\" first to fetch the image"
fi
Expand Down
Loading