Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80736?usp=email )
Change subject: docker/coreboot-sdk: Add meson ......................................................................
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 --- M util/docker/coreboot-jenkins-node/Dockerfile M util/docker/coreboot-sdk/Dockerfile 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved
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 \