github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

adds a new install-deps in the makefile; and some debug out

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2021-03-05 16:36:13 -06:00
parent ce8e8e8907
commit 1b1bb48709
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -124,7 +124,7 @@ TESTFLAGS_PARALLEL ?= 8
OUTPUTDIR = $(join $(ROOTDIR), _output) OUTPUTDIR = $(join $(ROOTDIR), _output)
CRIDIR=$(OUTPUTDIR)/cri CRIDIR=$(OUTPUTDIR)/cri
.PHONY: clean all AUTHORS build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release mandir install-man genman install-cri-deps cri-release cri-cni-release cri-integration bin/cri-integration.test .PHONY: clean all AUTHORS build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release mandir install-man genman install-cri-deps cri-release cri-cni-release cri-integration install-deps bin/cri-integration.test
.DEFAULT: default .DEFAULT: default
all: binaries all: binaries
@ -263,6 +263,7 @@ release: releases/$(RELEASE).tar.gz
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum @cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum
# install of cri deps into release output directory
ifeq ($(GOOS),windows) ifeq ($(GOOS),windows)
install-cri-deps: $(BINARIES) install-cri-deps: $(BINARIES)
mkdir -p $(CRIDIR) mkdir -p $(CRIDIR)
@ -344,6 +345,19 @@ uninstall:
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES))) @rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES)))
#TODO(mikebrow): refactor install-critools and install-cni to work for local host and for release
ifeq ($(GOOS),windows)
install-deps:
script/setup/install-runc
#script/setup/install-critools
#script/setup/install-cni-windows
else
install-deps: ## install cri dependencies
script/setup/install-seccomp
script/setup/install-runc
#script/setup/install-critools
#script/setup/install-cni
endif
coverage: ## generate coverprofiles from the unit tests, except tests that require root coverage: ## generate coverprofiles from the unit tests, except tests that require root
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@ -374,7 +388,7 @@ root-coverage: ## generate coverage profiles for unit tests that require root
fi; \ fi; \
done ) done )
vendor: vendor: ## vendor
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go mod tidy @go mod tidy
@go mod vendor @go mod vendor