summaryrefslogtreecommitdiff
path: root/util/docker
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2017-03-23 16:13:58 -0600
committerNico Huber <nico.h@gmx.de>2017-03-24 23:20:35 +0100
commitf0eda827b82d1989ec860e82aeb1a8b81616b356 (patch)
tree8681d358b35146c730c5a3faf6ef1eed96ee02cd /util/docker
parentb45bbb253f106825876df77630ef7204fd25761d (diff)
downloadcoreboot-f0eda827b82d1989ec860e82aeb1a8b81616b356.tar.xz
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. Change-Id: I26d4dca5805f57cab50065cf1c25164b909a0b3d Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/18961 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'util/docker')
-rw-r--r--util/docker/coreboot-sdk/Dockerfile7
1 files 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 <martin@coreboot.org>
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