Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

runv: modify GOPATH to build #23

Merged
merged 1 commit into from
Jan 30, 2018

Conversation

bergwolf
Copy link
Member

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

@sameo
Copy link

sameo commented Jan 29, 2018

LGTM

Approved with PullApprove

@sameo
Copy link

sameo commented Jan 29, 2018

@jodh-intel Could you please review?

@jodh-intel
Copy link
Contributor

This doesn't work for me:

$ make KATA_RUNTIME=runv 
(cd runv/gopath/src/github.com/hyperhq/runv/ && [ -e configure ] || ./autogen.sh && ./configure && GOPATH=/home/james/go/src/github.com/kata-containers/runtimes/runv/gopath make)
/bin/sh: ./autogen.sh: No such file or directory
make: *** [Makefile:50: build] Error 127

@WeiZhang555
Copy link
Member

How about making a temp dir under runtime root dir and using a soft link? a quick example:

diff --git a/Makefile b/Makefile
index bcf2dcf..b68a40d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ endif
 ifeq (runv,$(KATA_RUNTIME))
        RUNTIME_DIR = runv
        RUNTIME_NAME = runv
+       BUILD_ROOT = $(PWD)/build-runv
        DESTTARGET = $(DESTBINDIR)/$(RUNTIME_NAME)
 endif
 
@@ -47,7 +48,8 @@ ifeq (cc,$(KATA_RUNTIME))
        make -C $(RUNTIME_DIR) build-kata-system TARGET=$(TARGET) DESTTARGET=$(DESTTARGET)
 endif
 ifeq (runv,$(KATA_RUNTIME))
-       (cd $(RUNTIME_DIR) && [ -e configure ] || ./autogen.sh && ./configure && make)
+       mkdir -p $(BUILD_ROOT)/src/github.com/hyperhq && ln -sf $(PWD)/$(RUNTIME_DIR) $(BUILD_ROOT)/src/github.com/hyperhq/runv
+       (cd $(BUILD_ROOT)/src/github.com/hyperhq/runv && [ -e configure ] || ./autogen.sh && ./configure && make GOPATH=$(BUILD_ROOT))
 endif

It needs a little bit more modifications to make it work, only for showing my ideas.

@bergwolf
Copy link
Member Author

@jodh-intel did you sync submodule after pulling the pr locally? What is the output of ls runv/gopath/src/github.com/hyperhq/runv/?

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

Signed-off-by: Peng Tao <[email protected]>
@bergwolf
Copy link
Member Author

@WeiZhang555 thanks for the suggestion. PR updated.

@laijs
Copy link
Contributor

laijs commented Jan 30, 2018

LGTM

Approved with PullApprove

@jodh-intel
Copy link
Contributor

jodh-intel commented Jan 30, 2018

Hi @bergwolf - sorry, yes, my repo was stale.

lgtm.

Approved with PullApprove

@jodh-intel jodh-intel merged commit 71f5b11 into kata-containers:master Jan 30, 2018
jodh-intel pushed a commit to jodh-intel/runtimes that referenced this pull request Mar 15, 2018
@bergwolf bergwolf deleted the runv-repo branch March 22, 2018 02:50
mcastelino added a commit to mcastelino/runtime-1 that referenced this pull request Dec 28, 2018
Revendor firecracker go sdk for Firecracker 0.12.0 API changes

git shortlog

9614612 (HEAD -> master, origin/master, origin/HEAD) Merge pull request
653c342 Adding drives builder
3c1f5c3 Merge pr kata-containers#41
c4151ff Migrate firectl to its own repository
433f262 Merge pull request kata-containers#23 from xibz/fifo_logging_file
121ef9a add handler lists to handle initialization
0fd9825 Adding support for capturing fifo logs to file.
6b08ec7 Merge branch 'fc-0.12.0'
25878e7 Update for Firecracker 0.12.0 API changes
ea93f77 Regenerate API client from swagger spec
00d8eee Update swagger.yaml for firecracker 0.12.0

Signed-off-by: Manohar Castelino <[email protected]>
zklei pushed a commit to zklei/runtime that referenced this pull request Jun 13, 2019
This commit turns the agent into a subreaper, in order to reap all
the processes started from any container. This is the only way to
make sure we won't end up with some zombies processes in case we
have some child processes terminating before their own children.

Fixes kata-containers#23

Signed-off-by: Sebastien Boeuf <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants