From 50c3c38a18e197a2cf018af830b0b176d8841f22 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 26 Jun 2017 13:29:37 +0100 Subject: [PATCH 1/2] Clean up Makefile - clean up incorrect lines such as `tar xf tmp_linuxkit_bin.tar > $@` - split out targets to make tarballs and to untar Signed-off-by: Justin Cormack --- Makefile | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 286550ed3..653cbce29 100644 --- a/Makefile +++ b/Makefile @@ -21,28 +21,36 @@ endif PREFIX?=/usr/local/ MOBY_COMMIT=d8cc1b3f08df02ad563d3f548ac2527931a925a6 -bin/moby: Makefile | bin - docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar - tar xf tmp_moby_bin.tar > $@ - rm tmp_moby_bin.tar +MOBY_VERSION=0.0 +bin/moby: tmp_moby_bin.tar | bin + tar xf $< + rm $< touch $@ +tmp_moby_bin.tar: Makefile + docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(MOBY_COMMIT) -X main.Version=$(MOBY_VERSION)" -o bin/moby > $@ + RTF_COMMIT=34ec986e726d661f2a25ff085d669e057e3e5345 RTF_CMD=github.com/linuxkit/rtf/cmd -bin/rtf: Makefile | bin - docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/linuxkit/rtf --clone https://github.com/linuxkit/rtf.git --commit $(RTF_COMMIT) --package github.com/linuxkit/rtf --ldflags "-X $(RTF_CMD).GitCommit=$(RTF_COMMIT) -X $(RTF_CMD).Version=$(VERSION)" -o $@ > tmp_rtf_bin.tar - tar xf tmp_rtf_bin.tar > $@ - rm tmp_rtf_bin.tar +RTF_VERSION=0.0 +bin/rtf: tmp_rtf_bin.tar | bin + tar xf $< + rm $< touch $@ +tmp_rtf_bin.tar: Makefile + docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/linuxkit/rtf --clone https://github.com/linuxkit/rtf.git --commit $(RTF_COMMIT) --package github.com/linuxkit/rtf --ldflags "-X $(RTF_CMD).GitCommit=$(RTF_COMMIT) -X $(RTF_CMD).Version=$(RTF_VERSION)" -o bin/rtf > $@ + LINUXKIT_DEPS=$(wildcard src/cmd/linuxkit/*.go) Makefile vendor.conf -bin/linuxkit: $(LINUXKIT_DEPS) | bin - tar cf - vendor -C src/cmd/linuxkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_linuxkit_bin.tar - tar xf tmp_linuxkit_bin.tar > $@ - rm tmp_linuxkit_bin.tar +bin/linuxkit: tmp_linuxkit_bin.tar + tar xf $< + rm $< touch $@ +tmp_linuxkit_bin.tar: $(LINUXKIT_DEPS) + tar cf - vendor -C src/cmd/linuxkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o bin/linuxkit > $@ + local: $(LINUXKIT_DEPS) | bin go build -o bin/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" github.com/linuxkit/linuxkit/src/cmd/linuxkit From 3f5c236de71a2928bcf3d291c8955919449f7188 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 26 Jun 2017 13:39:47 +0100 Subject: [PATCH 2/2] Add a target for the cross build tests and make parallel Trying to speed up build a bit. Signed-off-by: Justin Cormack --- Makefile | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 653cbce29..472c46a90 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,17 @@ bin/linuxkit: tmp_linuxkit_bin.tar tmp_linuxkit_bin.tar: $(LINUXKIT_DEPS) tar cf - vendor -C src/cmd/linuxkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o bin/linuxkit > $@ +.PHONY: test-cross +test-cross: + $(MAKE) clean + $(MAKE) -j 3 GOOS=darwin tmp_moby_bin.tar tmp_rtf_bin.tar tmp_linuxkit_bin.tar + $(MAKE) clean + $(MAKE) -j 3 GOOS=windows tmp_moby_bin.tar tmp_rtf_bin.tar tmp_linuxkit_bin.tar + $(MAKE) clean + $(MAKE) -j 3 GOOS=linux tmp_moby_bin.tar tmp_rtf_bin.tar tmp_linuxkit_bin.tar + $(MAKE) clean + + local: $(LINUXKIT_DEPS) | bin go build -o bin/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" github.com/linuxkit/linuxkit/src/cmd/linuxkit @@ -68,40 +79,19 @@ test: collect-artifacts: artifacts/test.img.tar.gz artifacts/test-ltp.img.tar.gz .PHONY: ci ci-tag ci-pr -ci: - $(MAKE) clean - $(MAKE) GOOS=darwin - $(MAKE) clean - $(MAKE) GOOS=linux - $(MAKE) clean - $(MAKE) GOOS=windows - $(MAKE) clean +ci: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all $(MAKE) -C pkg tag -ci-tag: - $(MAKE) clean - $(MAKE) GOOS=darwin - $(MAKE) clean - $(MAKE) GOOS=linux - $(MAKE) clean - $(MAKE) GOOS=windows - $(MAKE) clean +ci-tag: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all $(MAKE) -C pkg tag -ci-pr: - $(MAKE) clean - $(MAKE) GOOS=darwin - $(MAKE) clean - $(MAKE) GOOS=linux - $(MAKE) clean - $(MAKE) GOOS=windows - $(MAKE) clean +ci-pr: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test pr