From 64f87f35412b24509123860b7cf6bdc9e6fab9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kr=C3=B3l?= Date: Fri, 20 Oct 2017 12:17:34 +0200 Subject: util/docker: add support for crossgcc building params MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/22276 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/docker/Makefile | 4 ++++ util/docker/coreboot-sdk/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/util/docker/Makefile b/util/docker/Makefile index ef43d37dda..f70ee8908e 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -34,6 +34,9 @@ export COREBOOT_CONTAINER_VERSION?=$(crossgcc_version) # Commit id to build from export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h) +# SDK architecture +export COREBOOT_CROSSGCC_PARAM?=all_without_gdb + test-docker: $(if $(DOCKER),,\ $(warning Docker command not found. Please install docker) \ @@ -50,6 +53,7 @@ coreboot-sdk: test-docker cat coreboot-sdk/Dockerfile | \ sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \ + sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \ $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) - upload-coreboot-sdk: test-docker-login diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index 4ea4896754..505bef20f9 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -75,7 +75,7 @@ RUN \ git clone https://review.coreboot.org/coreboot && \ cd coreboot/util/crossgcc && \ git checkout {{DOCKER_COMMIT}} && \ - make all_without_gdb \ + make {{CROSSGCC_PARAM}} \ BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \ cd /root && \ rm -rf coreboot -- cgit v1.2.3