[coreboot-gerrit] Change in coreboot[master]: util/docker: Update coreboot-sdk dockerfile

[Martin Roth (Code Review)]

Martin Roth has uploaded a new change for review. ( https://review.coreboot.org/18961 )

Change subject: util/docker: Update coreboot-sdk dockerfile
......................................................................

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 at google.com>
---
M util/docker/coreboot-sdk/Dockerfile
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/18961/1

diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index feaf843..d31eaf6 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -18,8 +18,8 @@
 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 @@
 	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
 

-- 
To view, visit https://review.coreboot.org/18961
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26d4dca5805f57cab50065cf1c25164b909a0b3d
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Martin Roth <martinroth at google.com>