GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2017-03-23 16:13:58 -06:00 committed by Nico Huber
parent b45bbb253f
commit f0eda827b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/docker/coreboot-sdk/Dockerfile
View File

@ -18,8 +18,8 @@ MAINTAINER Martin Roth <martin@coreboot.org>
RUN \ RUN \
useradd -p locked -m coreboot && \ useradd -p locked -m coreboot && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -qqy install gcc g++ make patch python diffutils bison flex \ apt-get -qqy install gcc g++ gnat-6 make patch python diffutils bison \
git doxygen ccache subversion p7zip-full unrar-free \ flex git doxygen ccache subversion p7zip-full unrar-free \
m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \ m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \
dh-autoreconf unifont \ dh-autoreconf unifont \
libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \
@ -33,7 +33,8 @@ RUN \
git clone http://review.coreboot.org/coreboot && \ git clone http://review.coreboot.org/coreboot && \
cd coreboot/util/crossgcc && \ cd coreboot/util/crossgcc && \
git checkout {{DOCKER_COMMIT}} && \ 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 && \ cd /root && \
rm -rf coreboot rm -rf coreboot