| commit | 55b3c0466cce5c08a3fa14d0341b8a8d090f4f71 | [log] [tgz] |
|---|---|---|
| author | Arthur Heymans <arthur@aheymans.xyz> | Fri Feb 23 19:03:16 2024 +0100 |
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | Mon Feb 26 17:25:00 2024 +0000 |
| tree | c8ac9fa836e10b282fd339f9f3450de44b41a67d | |
| parent | 6d1560f05d2ebaf80d4486a21c23524a234aaa08 [diff] |
docker/coreboot-sdk: Add meson This is needed to build opensil. With meson and ninja added to the coreboot-sdk image there is no need have them in the jenkins node image. Change-Id: I36188ae895f2a770f1dc4528f332c09bf386db73 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80736 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index f1ab4e9..351cc44 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile
@@ -23,8 +23,6 @@ liblua5.4-dev \ linkchecker \ lua5.4 \ - meson \ - ninja-build \ openssh-server \ parallel \ ruby-full \
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index f1d7908..ecada14 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile
@@ -64,8 +64,10 @@ libyaml-dev \ m4 \ make \ + meson \ msitools \ neovim \ + ninja-build \ openssh-client \ openssl \ parted \