<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29456">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/docker: Unify local build targets<br><br>Add a `docker-run-local` target that is used as a template for the<br>local build targets (`docker-build-coreboot`, `docker-abuild`, and<br>`docker-what-jenkins-does`).<br><br>Note this changes the user for `docker-what-jenkins-does` which has<br>(ccache) issues if it's not `root`. Will be fixed in a follow-up.<br><br>Change-Id: I9088fb9211726cddc37b17ddf70170c2c382679e<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M util/docker/Makefile<br>1 file changed, 12 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/29456/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/docker/Makefile b/util/docker/Makefile</span><br><span>index beb2a7e..32714fc 100644</span><br><span>--- a/util/docker/Makefile</span><br><span>+++ b/util/docker/Makefile</span><br><span>@@ -95,29 +95,23 @@</span><br><span>          $(DOCKER) rmi $$($(DOCKER) images | grep -v "REPOSITORY" | tr -s ' ' | cut -f3 -d ' '); \</span><br><span>  fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-docker-build-coreboot: test-docker</span><br><span style="color: hsl(120, 100%, 40%);">+docker-run-local: test-docker</span><br><span>      $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \</span><br><span>                --user $(UID):$(GID) \</span><br><span>               --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span style="color: hsl(0, 100%, 40%);">-              /bin/bash -c "cd /home/coreboot/coreboot && \</span><br><span style="color: hsl(0, 100%, 40%);">-              make clean && \</span><br><span style="color: hsl(0, 100%, 40%);">-         make $(BUILD_CMD); \</span><br><span style="color: hsl(0, 100%, 40%);">-            rm .xcompile"</span><br><span style="color: hsl(120, 100%, 40%);">+            /bin/bash -c "cd /home/coreboot/coreboot && $(DOCKER_RUN_LOCAL)"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-docker-abuild: test-docker</span><br><span style="color: hsl(0, 100%, 40%);">-        $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \</span><br><span style="color: hsl(0, 100%, 40%);">-           --user $(UID):$(GID) \</span><br><span style="color: hsl(0, 100%, 40%);">-          --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span style="color: hsl(0, 100%, 40%);">-              /bin/bash -c "cd /home/coreboot/coreboot && \</span><br><span style="color: hsl(0, 100%, 40%);">-              make clean && \</span><br><span style="color: hsl(0, 100%, 40%);">-         util/abuild/abuild $(ABUILD_ARGS); \</span><br><span style="color: hsl(0, 100%, 40%);">-            rm -f .xcompile"</span><br><span style="color: hsl(120, 100%, 40%);">+docker-build-coreboot: docker-run-local</span><br><span style="color: hsl(120, 100%, 40%);">+docker-build-coreboot: override DOCKER_RUN_LOCAL := \</span><br><span style="color: hsl(120, 100%, 40%);">+ make clean && make $(BUILD_CMD); rm -f .xcompile</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-docker-what-jenkins-does: test-docker</span><br><span style="color: hsl(0, 100%, 40%);">-       $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \</span><br><span style="color: hsl(0, 100%, 40%);">-           --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span style="color: hsl(0, 100%, 40%);">-              /bin/bash -c "cd /home/coreboot/coreboot && \</span><br><span style="color: hsl(0, 100%, 40%);">-              make clean && make what-jenkins-does CPUS=$(CPUS)"</span><br><span style="color: hsl(120, 100%, 40%);">+docker-abuild: docker-run-local</span><br><span style="color: hsl(120, 100%, 40%);">+docker-abuild: override DOCKER_RUN_LOCAL := \</span><br><span style="color: hsl(120, 100%, 40%);">+       make clean && util/abuild/abuild $(ABUILD_ARGS); rm -f .xcompile</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+docker-what-jenkins-does: docker-run-local</span><br><span style="color: hsl(120, 100%, 40%);">+docker-what-jenkins-does: override DOCKER_RUN_LOCAL := \</span><br><span style="color: hsl(120, 100%, 40%);">+      make clean && make what-jenkins-does CPUS=$(CPUS)</span><br><span> </span><br><span> docker-jenkins-server: test-docker</span><br><span>  @if [ ! -d "$(COREBOOT_JENKINS_CACHE_DIR)" ]; then \</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29456">change 29456</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29456"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9088fb9211726cddc37b17ddf70170c2c382679e </div>
<div style="display:none"> Gerrit-Change-Number: 29456 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>