Merge pull request #3659 from edvinerikson/fix-install

fix: make command
This commit is contained in:
Dave Tucker
2021-05-26 14:27:52 +01:00
committed by GitHub
3 changed files with 9 additions and 6 deletions

1
src/cmd/linuxkit/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
bin/

View File

@@ -26,12 +26,12 @@ all: default
LINUXKIT_DEPS=$(wildcard *.go) $(wildcard */*.go) Makefile
$(LINUXKIT): tmp_linuxkit_bin.tar | bin
tar xf $<
tar -C $(dir $(LINUXKIT)) -xf $<
rm $<
touch $@
tmp_linuxkit_bin.tar: $(LINUXKIT_DEPS)
tar cf - -C . . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit/src/cmd/linuxkit --ldflags "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=$(GIT_COMMIT) -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=$(VERSION)" -o $(LINUXKIT) > $@
tar cf - -C . . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit/src/cmd/linuxkit --ldflags "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=$(GIT_COMMIT) -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=$(VERSION)" -o $(notdir $(LINUXKIT)) > $@
.PHONY: test-cross
test-cross: