[coreboot-gerrit] Change in coreboot[master]: util/docker: Unify local build targets
Nico Huber (Code Review)
gerrit at coreboot.org
Sun Nov 4 19:37:16 CET 2018
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/29456
Change subject: util/docker: Unify local build targets
......................................................................
util/docker: Unify local build targets
Add a `docker-run-local` target that is used as a template for the
local build targets (`docker-build-coreboot`, `docker-abuild`, and
`docker-what-jenkins-does`).
Note this changes the user for `docker-what-jenkins-does` which has
(ccache) issues if it's not `root`. Will be fixed in a follow-up.
Change-Id: I9088fb9211726cddc37b17ddf70170c2c382679e
Signed-off-by: Nico Huber <nico.h at gmx.de>
---
M util/docker/Makefile
1 file changed, 12 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/29456/1
diff --git a/util/docker/Makefile b/util/docker/Makefile
index beb2a7e..32714fc 100644
--- a/util/docker/Makefile
+++ b/util/docker/Makefile
@@ -95,29 +95,23 @@
$(DOCKER) rmi $$($(DOCKER) images | grep -v "REPOSITORY" | tr -s ' ' | cut -f3 -d ' '); \
fi
-docker-build-coreboot: test-docker
+docker-run-local: test-docker
$(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
--user $(UID):$(GID) \
--rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \
- /bin/bash -c "cd /home/coreboot/coreboot && \
- make clean && \
- make $(BUILD_CMD); \
- rm .xcompile"
+ /bin/bash -c "cd /home/coreboot/coreboot && $(DOCKER_RUN_LOCAL)"
-docker-abuild: test-docker
- $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
- --user $(UID):$(GID) \
- --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \
- /bin/bash -c "cd /home/coreboot/coreboot && \
- make clean && \
- util/abuild/abuild $(ABUILD_ARGS); \
- rm -f .xcompile"
+docker-build-coreboot: docker-run-local
+docker-build-coreboot: override DOCKER_RUN_LOCAL := \
+ make clean && make $(BUILD_CMD); rm -f .xcompile
-docker-what-jenkins-does: test-docker
- $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \
- --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \
- /bin/bash -c "cd /home/coreboot/coreboot && \
- make clean && make what-jenkins-does CPUS=$(CPUS)"
+docker-abuild: docker-run-local
+docker-abuild: override DOCKER_RUN_LOCAL := \
+ make clean && util/abuild/abuild $(ABUILD_ARGS); rm -f .xcompile
+
+docker-what-jenkins-does: docker-run-local
+docker-what-jenkins-does: override DOCKER_RUN_LOCAL := \
+ make clean && make what-jenkins-does CPUS=$(CPUS)
docker-jenkins-server: test-docker
@if [ ! -d "$(COREBOOT_JENKINS_CACHE_DIR)" ]; then \
--
To view, visit https://review.coreboot.org/29456
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9088fb9211726cddc37b17ddf70170c2c382679e
Gerrit-Change-Number: 29456
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181104/43b30b25/attachment-0001.html>
More information about the coreboot-gerrit
mailing list