diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2024-02-23 19:03:16 +0100 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2024-02-26 17:25:00 +0000 |
| commit | 55b3c0466cce5c08a3fa14d0341b8a8d090f4f71 (patch) | |
| tree | c8ac9fa836e10b282fd339f9f3450de44b41a67d /util/docker | |
| 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>
Diffstat (limited to 'util/docker')
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 2 | ||||
| -rw-r--r-- | util/docker/coreboot-sdk/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index f1ab4e9a9c..351cc4413a 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get -y update && \ 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 f1d790805c..ecada143b3 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -64,8 +64,10 @@ RUN \ libyaml-dev \ m4 \ make \ + meson \ msitools \ neovim \ + ninja-build \ openssh-client \ openssl \ parted \ |