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 commit6b28fff0b(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 <pgeorgi@chromium.org> Original-Commit-Id:f0eda827b8Original-Change-Id: I26d4dca5805f57cab50065cf1c25164b909a0b3d Original-Signed-off-by: Martin Roth <martinroth@google.com> Original-Reviewed-on: https://review.coreboot.org/18961 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com> Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com> Original-Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://chromium-review.googlesource.com/459505
This commit is contained in:
parent
c256a420f0
commit
909c4c670e
1 changed files with 4 additions and 3 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue