From 55b3c0466cce5c08a3fa14d0341b8a8d090f4f71 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Fri, 23 Feb 2024 19:03:16 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80736 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- util/docker/coreboot-jenkins-node/Dockerfile | 2 -- 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 \