From 2747da08deb31ee8a72b02daa10bcbfa45ee1849 Mon Sep 17 00:00:00 2001 From: "Emrich Oliver (ETAS)" Date: Tue, 20 Jan 2026 09:28:56 +0000 Subject: [PATCH 1/3] Added valgrind and other tools --- .../.devcontainer/s-core-local/tests/test_default.sh | 3 +++ .../.devcontainer/s-core-local/versions.yaml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh index 162b117..429d9be 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh @@ -48,6 +48,9 @@ check "validate JAVA_HOME is set correctly" bash -c 'echo $JAVA_HOME | xargs rea # additional developer tools check "validate gdb is working and has the correct version" bash -c "gdb --version | grep '${gdb_version}'" check "validate gh is working and has the correct version" bash -c "gh --version | grep '${gh_version}'" +check "validate valgrind is working and has the correct version" bash -c "gh --version | grep '${valgrind_version}'" +check "validate linux_tools_common is working and has the correct version" bash -c "gh --version | grep '${linux_tools_common_version}'" +check "validate linux_tools_generic is working and has the correct version" bash -c "gh --version | grep '${linux_tools_generic_version}'" # Qemu target-related tools check "validate qemu-system-aarch64 is working and has the correct version" bash -c "qemu-system-aarch64 --version | grep '${qemu_system_arm_version}'" diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml index d06a163..658d07b 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -28,6 +28,15 @@ gh: openjdk_21: version: "21.0.9" +valgrind: + version: 3.26.0 + +linux_tools_common: + version: 6.8.0 + +linux_tools_generic: + version: 6.8.0 + bazel: # https://github.com/bazelbuild/bazel/releases -- latest version as of 2025-09-24 version: 8.4.1 From 38b8c538ca9efb7beb5175b70c27d1c84daec845 Mon Sep 17 00:00:00 2001 From: "Emrich Oliver (ETAS)" Date: Tue, 20 Jan 2026 09:28:56 +0000 Subject: [PATCH 2/3] Added valgrind and other tools --- .../.devcontainer/s-core-local/install.sh | 4 ++++ .../.devcontainer/s-core-local/tests/test_default.sh | 6 +++--- .../.devcontainer/s-core-local/versions.yaml | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh index 382333f..8ce65ed 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -115,6 +115,10 @@ apt-get install -y sshpass="${sshpass_version}*" # additional developer tools apt-get install -y gdb +apt-get install -y valgrind=1:${valgrind_version}* +apt-get install -y linux-tools-common=${linux_tools_common_version}* +apt-get install -y linux-tools-generic=${linux_tools_generic_version}* + # Bash completion for rust tooling rustup completions bash rustup >> /etc/bash_completion.d/rustup.bash rustup completions bash cargo >> /etc/bash_completion.d/cargo.bash diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh index 429d9be..8a0903b 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh @@ -48,9 +48,9 @@ check "validate JAVA_HOME is set correctly" bash -c 'echo $JAVA_HOME | xargs rea # additional developer tools check "validate gdb is working and has the correct version" bash -c "gdb --version | grep '${gdb_version}'" check "validate gh is working and has the correct version" bash -c "gh --version | grep '${gh_version}'" -check "validate valgrind is working and has the correct version" bash -c "gh --version | grep '${valgrind_version}'" -check "validate linux_tools_common is working and has the correct version" bash -c "gh --version | grep '${linux_tools_common_version}'" -check "validate linux_tools_generic is working and has the correct version" bash -c "gh --version | grep '${linux_tools_generic_version}'" +check "validate valgrind is working and has the correct version" bash -c "valgrind --version | grep '${valgrind_version}'" +check "validate linux_tools_common is working and has the correct version" bash -c "dpkg -s linux-tools-common 2>/dev/null | grep -q 'Version: ${linux_tools_common_version}'" +check "validate linux_tools_generic is working and has the correct version" bash -c "dpkg -s linux-tools-generic 2>/dev/null | grep -q 'Version: ${linux_tools_generic_version}'" # Qemu target-related tools check "validate qemu-system-aarch64 is working and has the correct version" bash -c "qemu-system-aarch64 --version | grep '${qemu_system_arm_version}'" diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml index 658d07b..ef335fb 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -29,13 +29,13 @@ openjdk_21: version: "21.0.9" valgrind: - version: 3.26.0 + version: "3.22.0" linux_tools_common: - version: 6.8.0 + version: "6.8.0" linux_tools_generic: - version: 6.8.0 + version: "6.8.0" bazel: # https://github.com/bazelbuild/bazel/releases -- latest version as of 2025-09-24 From ccf065bf031d8ff7f06f01a36fffbda1454b019c Mon Sep 17 00:00:00 2001 From: "Emrich Oliver (ETAS)" Date: Fri, 23 Jan 2026 11:42:38 +0100 Subject: [PATCH 3/3] Removed linux-tools* --- .../.devcontainer/s-core-local/install.sh | 2 -- .../.devcontainer/s-core-local/tests/test_default.sh | 2 -- .../.devcontainer/s-core-local/versions.yaml | 6 ------ 3 files changed, 10 deletions(-) diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh index 96c5f50..90a1414 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -120,8 +120,6 @@ apt-get install -y sshpass="${sshpass_version}*" apt-get install -y gdb="${gdb_version}*" apt-get install -y valgrind=1:${valgrind_version}* -apt-get install -y linux-tools-common=${linux_tools_common_version}* -apt-get install -y linux-tools-generic=${linux_tools_generic_version}* # Bash completion for rust tooling rustup completions bash rustup >> /etc/bash_completion.d/rustup.bash diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh index 8a0903b..a4469f1 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh @@ -49,8 +49,6 @@ check "validate JAVA_HOME is set correctly" bash -c 'echo $JAVA_HOME | xargs rea check "validate gdb is working and has the correct version" bash -c "gdb --version | grep '${gdb_version}'" check "validate gh is working and has the correct version" bash -c "gh --version | grep '${gh_version}'" check "validate valgrind is working and has the correct version" bash -c "valgrind --version | grep '${valgrind_version}'" -check "validate linux_tools_common is working and has the correct version" bash -c "dpkg -s linux-tools-common 2>/dev/null | grep -q 'Version: ${linux_tools_common_version}'" -check "validate linux_tools_generic is working and has the correct version" bash -c "dpkg -s linux-tools-generic 2>/dev/null | grep -q 'Version: ${linux_tools_generic_version}'" # Qemu target-related tools check "validate qemu-system-aarch64 is working and has the correct version" bash -c "qemu-system-aarch64 --version | grep '${qemu_system_arm_version}'" diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml index f371664..bd93590 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -31,12 +31,6 @@ openjdk_21: valgrind: version: "3.22.0" -linux_tools_common: - version: "6.8.0" - -linux_tools_generic: - version: "6.8.0" - bazel: # https://github.com/bazelbuild/bazel/releases -- latest version as of 2025-09-24 version: 8.4.1