github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-23 22:17:19 +00:00
Code Issues Projects Releases Wiki Activity

runtime: build with vendor

Browse Source 
So that we don't have to download dependencies.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao 2020-04-29 19:20:42 -07:00
parent cd9e309f63
commit e90c5d45b3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/Makefile
View File

@ -486,7 +486,7 @@ ifneq ($(FEATURE_SELINUX),no)
endif endif
# go build common flags # go build common flags
BUILDFLAGS := -buildmode=pie ${BUILDTAGS} BUILDFLAGS := -buildmode=pie -mod=vendor ${BUILDTAGS}
# whether stipping the binary # whether stipping the binary
ifeq ($(STRIP),yes) ifeq ($(STRIP),yes)
@ -561,7 +561,7 @@ $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)
$(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) $(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
$(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) -i -o $@ .) $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)
.PHONY: \ .PHONY: \
check \ check \

7
src/runtime/virtcontainers/Makefile
View File

@ -13,6 +13,7 @@ HOOK_BIN := hook
KATA_SHIM_DIR := shim/mock/kata-shim KATA_SHIM_DIR := shim/mock/kata-shim
KATA_SHIM_BIN := kata-shim KATA_SHIM_BIN := kata-shim
MK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) MK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
GOBUILD_FLAGS := -mod=vendor
# #
# Pretty printing # Pretty printing
@ -29,13 +30,13 @@ QUIET_GOBUILD = $(Q:@=@echo ' GOBUILD '$@;)
all: build binaries all: build binaries
build: build:
$(QUIET_GOBUILD)go build $(go list ./... | grep -v /vendor/) $(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) $(go list ./... | grep -v /vendor/)
hook: hook:
$(QUIET_GOBUILD)go build -o $(HOOK_DIR)/$@ $(HOOK_DIR)/*.go $(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) -o $(HOOK_DIR)/$@ $(HOOK_DIR)/*.go
kata-shim: kata-shim:
$(QUIET_GOBUILD)go build -o $(KATA_SHIM_DIR)/$@ $(KATA_SHIM_DIR)/*.go $(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) -o $(KATA_SHIM_DIR)/$@ $(KATA_SHIM_DIR)/*.go
binaries: hook kata-shim binaries: hook kata-shim