github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-05 18:14:55 +00:00
Code Issues Projects Releases Wiki Activity

runv: modify GOPATH to build

Browse Source 
So that we can use runv repo as git submodule without splitting it.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-01-28 12:12:55 +08:00
parent 275c683ce5
commit e0f4c52836
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build-runv

4
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "cc-runtime"] [submodule "cc-runtime"]
path = cc-runtime path = cc-runtime
url = https://github.com/clearcontainers/runtime url = https://github.com/clearcontainers/runtime
[submodule "runvcli"] [submodule "runv"]
path = runv path = runv
url = https://github.com/hyperhq/runvcli.git url = https://github.com/hyperhq/runv.git

10
Makefile
View File

@ -37,6 +37,9 @@ endif
ifeq (runv,$(KATA_RUNTIME)) ifeq (runv,$(KATA_RUNTIME))
RUNTIME_DIR = runv RUNTIME_DIR = runv
RUNTIME_NAME = runv RUNTIME_NAME = runv
BUILD_ROOT = $(shell pwd)/build-runv
HYPER_ROOT = $(BUILD_ROOT)/src/github.com/hyperhq
RUNV_ROOT = $(HYPER_ROOT)/runv
DESTTARGET = $(DESTBINDIR)/$(RUNTIME_NAME) DESTTARGET = $(DESTBINDIR)/$(RUNTIME_NAME)
endif endif
@ -47,7 +50,8 @@ ifeq (cc,$(KATA_RUNTIME))
make -C $(RUNTIME_DIR) build-kata-system TARGET=$(TARGET) DESTTARGET=$(DESTTARGET) make -C $(RUNTIME_DIR) build-kata-system TARGET=$(TARGET) DESTTARGET=$(DESTTARGET)
endif endif
ifeq (runv,$(KATA_RUNTIME)) ifeq (runv,$(KATA_RUNTIME))
(cd $(RUNTIME_DIR) && [ -e configure ] || ./autogen.sh && ./configure && make) mkdir -p $(HYPER_ROOT) && ln -sf $(shell pwd)/$(RUNTIME_DIR) $(RUNV_ROOT)
cd $(RUNV_ROOT) && [ -e configure ] || ./autogen.sh && ./configure && make GOPATH=$(BUILD_ROOT)
endif endif
install: install-runtime create-symlink install: install-runtime create-symlink
@ -57,7 +61,7 @@ ifeq (cc,$(KATA_RUNTIME))
make -C $(RUNTIME_DIR) install-kata-system TARGET=$(TARGET) DESTTARGET=$(DESTTARGET) make -C $(RUNTIME_DIR) install-kata-system TARGET=$(TARGET) DESTTARGET=$(DESTTARGET)
endif endif
ifeq (runv,$(KATA_RUNTIME)) ifeq (runv,$(KATA_RUNTIME))
make -C $(RUNTIME_DIR) install make -C $(RUNV_ROOT) install-exec-local
endif endif
create-symlink: create-symlink:
@ -71,7 +75,7 @@ ifeq (cc,$(KATA_RUNTIME))
make -C $(RUNTIME_DIR) clean TARGET=$(TARGET) make -C $(RUNTIME_DIR) clean TARGET=$(TARGET)
endif endif
ifeq (runv,$(KATA_RUNTIME)) ifeq (runv,$(KATA_RUNTIME))
make -C $(RUNTIME_DIR) clean make -C $(RUNV_ROOT) clean
endif endif
help: help:

2
runv

@ -1 +1 @@
Subproject commit c16abf7a687558b2c9f2eac5391513dc2bdb9b50 Subproject commit 299f4e6493050173c0bd30a48fde31b3a34b0f24