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

util/docker: add support for crossgcc building params 

In some cases users may want to build just one toolchain not all. This
patch introduces COREBOOT_CROSSGCC_PARAM, which by default is set to
all_without_gdb so previous behavior is not changed. Users can pass
different parameter eg. COREBOOT_CROSSGCC_PARAM=build-x64 to build just
x64 SDK.

Change-Id: I858ba09644b5b86a4b0e828e4f342aee5083be93
Signed-off-by: Piotr Król <piotr.krol@3mdeb.com>
Reviewed-on: https://review.coreboot.org/22276
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Piotr Król 2017-10-20 12:17:34 +02:00 committed by Martin Roth
parent 0709dc0468
commit 64f87f3541
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/docker/Makefile
View File

@ -34,6 +34,9 @@ export COREBOOT_CONTAINER_VERSION?=$(crossgcc_version)
# Commit id to build from # Commit id to build from
export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h) export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h)
# SDK architecture
export COREBOOT_CROSSGCC_PARAM?=all_without_gdb
test-docker: test-docker:
$(if $(DOCKER),,\ $(if $(DOCKER),,\
$(warning Docker command not found. Please install docker) \ $(warning Docker command not found. Please install docker) \
@ -50,6 +53,7 @@ coreboot-sdk: test-docker
cat coreboot-sdk/Dockerfile | \ cat coreboot-sdk/Dockerfile | \
sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \
sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \ sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \
sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \
$(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) - $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) -
upload-coreboot-sdk: test-docker-login upload-coreboot-sdk: test-docker-login

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

@ -75,7 +75,7 @@ RUN \
git clone https://review.coreboot.org/coreboot && \ git clone https://review.coreboot.org/coreboot && \
cd coreboot/util/crossgcc && \ cd coreboot/util/crossgcc && \
git checkout {{DOCKER_COMMIT}} && \ git checkout {{DOCKER_COMMIT}} && \
make all_without_gdb \ make {{CROSSGCC_PARAM}} \
BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \ BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \
cd /root && \ cd /root && \
rm -rf coreboot rm -rf coreboot