github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-01 17:52:40 +00:00
Code Issues Projects Releases Wiki Activity

make: Add "GOPATH not set"

Browse Source 
Most of the projects, they can be built with "make".  After that,
"sudo make install" can install the application.
It is not work for kata-runtime because kata-runtime's make must work
with golang in the environment that default sudo cannot supply it.
But "make install" doesn't need golang.

So add "GOPATH not set" to handle the issue.

Fixes: #1008

Signed-off-by: Hui Zhu <teawater@hyper.sh>
This commit is contained in:
Hui Zhu 2018-12-12 10:47:07 +08:00
parent a323a87b59
commit 25358444ad
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile
View File

@ -12,27 +12,33 @@ for file in /etc/os-release /usr/lib/os-release; do \
fi \ fi \
done) done)
GOARCH=$(shell go env GOARCH)
HOST_ARCH=$(shell arch) HOST_ARCH=$(shell arch)
SKIP_GO_VERSION_CHECK= ifeq ($(GOPATH),)
SKIP_GO_VERSION_CHECK=y
else
SKIP_GO_VERSION_CHECK=
endif
ifeq ($(SKIP_GO_VERSION_CHECK),) ifeq ($(SKIP_GO_VERSION_CHECK),)
include golang.mk include golang.mk
endif endif
ifeq ($(ARCH),) ifneq ($(GOPATH),)
ARCH = $(GOARCH) GOARCH=$(shell go env GOARCH)
ifeq ($(ARCH),)
ARCH = $(GOARCH)
endif
ARCH_DIR = arch
ARCH_FILE_SUFFIX = -options.mk
ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)
ARCH_FILES = $(wildcard arch/*$(ARCH_FILE_SUFFIX))
ALL_ARCHES = $(patsubst $(ARCH_DIR)/%$(ARCH_FILE_SUFFIX),%,$(ARCH_FILES))
# Load architecture-dependent settings
include $(ARCH_FILE)
endif endif
ARCH_DIR = arch
ARCH_FILE_SUFFIX = -options.mk
ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)
ARCH_FILES = $(wildcard arch/*$(ARCH_FILE_SUFFIX))
ALL_ARCHES = $(patsubst $(ARCH_DIR)/%$(ARCH_FILE_SUFFIX),%,$(ARCH_FILES))
# Load architecture-dependent settings
include $(ARCH_FILE)
PROJECT_TYPE = kata PROJECT_TYPE = kata
PROJECT_NAME = Kata Containers PROJECT_NAME = Kata Containers
PROJECT_TAG = kata-containers PROJECT_TAG = kata-containers
@ -490,6 +496,7 @@ show-footer:
@printf "\tBugs: $(PROJECT_BUG_URL)\n\n" @printf "\tBugs: $(PROJECT_BUG_URL)\n\n"
show-summary: show-header show-summary: show-header
ifneq ($(GOPATH),)
@printf "• architecture:\n" @printf "• architecture:\n"
@printf "\tHost: $(HOST_ARCH)\n" @printf "\tHost: $(HOST_ARCH)\n"
@printf "\tgolang: $(GOARCH)\n" @printf "\tgolang: $(GOARCH)\n"
@ -498,6 +505,10 @@ show-summary: show-header
@printf "• golang:\n" @printf "• golang:\n"
@printf "\t" @printf "\t"
@go version @go version
else
@printf "• GOPATH not set:\n"
@printf "\tCan only install prebuilt binaries\n"
endif
@printf "\n" @printf "\n"
@printf "• Summary:\n" @printf "• Summary:\n"
@printf "\n" @printf "\n"