From 909c4c670e4550052db9d1589e6ccff6b7af58a6 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 23 Mar 2017 16:13:58 -0600 Subject: [PATCH] UPSTREAM: util/docker: Update coreboot-sdk dockerfile - Update the dockerfile which generates the base docker image for the coreboot builders to include gnat. This matches the changes made in the crossgcc/Dockerfile in commit 6b28fff0b (crossgcc/Dockerfile: Add gnat to build the Ada toolchain). - Remove the -b from the toolchain build command line. This doesn't seem to be needed. BUG=none BRANCH=none TEST=none Change-Id: I0b295e817dd3d7f35324cfb54323ad9695579105 Signed-off-by: Patrick Georgi Original-Commit-Id: f0eda827b82d1989ec860e82aeb1a8b81616b356 Original-Change-Id: I26d4dca5805f57cab50065cf1c25164b909a0b3d Original-Signed-off-by: Martin Roth Original-Reviewed-on: https://review.coreboot.org/18961 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Patrick Georgi Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Nico Huber Reviewed-on: https://chromium-review.googlesource.com/459505 --- util/docker/coreboot-sdk/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index feaf8434ba..d31eaf692e 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -18,8 +18,8 @@ MAINTAINER Martin Roth RUN \ useradd -p locked -m coreboot && \ apt-get -qq update && \ - apt-get -qqy install gcc g++ make patch python diffutils bison flex \ - git doxygen ccache subversion p7zip-full unrar-free \ + apt-get -qqy install gcc g++ gnat-6 make patch python diffutils bison \ + flex git doxygen ccache subversion p7zip-full unrar-free \ m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \ dh-autoreconf unifont \ libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ @@ -33,7 +33,8 @@ RUN \ git clone http://review.coreboot.org/coreboot && \ cd coreboot/util/crossgcc && \ git checkout {{DOCKER_COMMIT}} && \ - make all_without_gdb CPUS=$(nproc) DEST=/opt/xgcc BUILDGCC_OPTIONS=-b && \ + make all_without_gdb \ + BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \ cd /root && \ rm -rf coreboot