Changes:
f691522 (Ace-Tang, 5 days ago) cli: do not fail on list when some containers bust
kata-runtime list command should list all valid container, not fail when some containers information uncorrent, like rootfs not found.
Fixes: #1592
Signed-off-by: Ace-Tang (cherry picked from commit b7f51be8ce937fc8a56113789f6906571ae9601d) Signed-off-by: Ganesh Maharaj Mahalingam
cbf5017 (Alice Frosi, 2 weeks ago) s390x: fix gofmt complain
Fix gofmt complain for virtcontainers/qemu_s390x.go
Fixes: #1553
Signed-off-by: Alice Frosi (cherry picked from commit a013f9b27baef1e6e7624fd12da1ee308809c179) Signed-off-by: Ganesh Maharaj Mahalingam
e0c859f (Hui Zhu, 2 weeks ago) template: Add check if vm template is on before vm template initialize
Add check if vm template is on before vm template initialize.
Fixes: #1514
Signed-off-by: Hui Zhu (cherry picked from commit 76a5076e5671e7d76ca2964eb8ae15b530b92340) Signed-off-by: Ganesh Maharaj Mahalingam
f9e1121 (Stefan Hajnoczi, 2 weeks ago) build: turn COMMIT into a file dependency
Makefile uses $(shell) to build a git commit string. Unfortunately this means make targets cannot be rebuilt when COMMIT changes value. We need to reflect this string value into files on which make can process dependencies.
I stole a solution from QEMU's Makefile: 1. Print the string into .git-commit.tmp 2. If .git-commit.tmp differs from .git-commit, copy it to .git-commit 3. Depend on .git-commit from all targets that need $COMMIT
This way targets are only rebuilt if the commit string value actually changes.
Signed-off-by: Stefan Hajnoczi (cherry picked from commit 7949cd6ebce3cf985e283cff28db56b4eebac5c8) Signed-off-by: Ganesh Maharaj Mahalingam
c3c0158 (Stefan Hajnoczi, 2 weeks ago) build: extract config-generated.go.in from Makefile
Makefile had a template for cli/config-generated.go embedded inside it. There is already a templating mechanism for .in files. Using a .in file is cleaner since it avoids make's awkward interaction with shell escaping and line splitting.
This patch moves the template into cli/config-generated.go.in and reuses the existing .in file templating mechanism. Only the PKGRUNDIR variable needs to be added.
Signed-off-by: Stefan Hajnoczi (cherry picked from commit 0f7bb25cf7da481c92c2ee8f8467b5a296deeffb) Signed-off-by: Ganesh Maharaj Mahalingam
77e91f9 (Stefan Hajnoczi, 2 weeks ago) build: fix race between 'clean' and generated files
When a parallel build is invoked using "make -j4" there is a race between EXTRA_DEPS ('clean') and generating files:
CPU1 CPU2
---- ----
create cli/generated-config.go
rm cli/generated-config.go
go build -> error: generated-config.go doesn't exist!
Previous commits ensured that targets relying on version information like VERSION and COMMIT declare appropriate dependencies. Therefore make is now able to detect changes and rebuild targets as needed. It is no longer necessary to abuse the clean target to force a rebuild.
Fixes: #1540 Signed-off-by: Stefan Hajnoczi (cherry picked from commit 53ebe51f1c8f346869894e227a8f182511b51fb0) Signed-off-by: Ganesh Maharaj Mahalingam
f398248 (Stefan Hajnoczi, 2 weeks ago) build: use MAKEFILE_LIST for a more complete Makefile dependency
Depending on Makefile is not enough to detect all changes. We must rebuild when included makefiles change, too.
The MAKEFILE_LIST special variable contains the filenames of all included makefiles and Makefile itself.
Signed-off-by: Stefan Hajnoczi (cherry picked from commit 1eb5d6c900886eedd9117a1777cc39c02bdd0c78) Signed-off-by: Ganesh Maharaj Mahalingam
537ec90 (Stefan Hajnoczi, 2 weeks ago) build: add VERSION dependency to netmon target
The netmon target must be rebuilt when the VERSION file changes since it uses the value of VERSION on the build command-line.
Signed-off-by: Stefan Hajnoczi (cherry picked from commit bbf92533f4bbc35ae7e0bdd5c0bf9c4c5c25e88e) Signed-off-by: Ganesh Maharaj Mahalingam
2b3222e (Stefan Hajnoczi, 2 weeks ago) build: remove duplicated COLLECT_SCRIPT from clean
GENERATED_FILES already includes COLLECT_SCRIPT, so there's no need to specify it again:
GENERATED_FILES += $(COLLECT_SCRIPT)
...
clean:
$(QUIET_CLEAN)rm -f ... $(GENERATED_FILES) $(COLLECT_SCRIPT)
Signed-off-by: Stefan Hajnoczi (cherry picked from commit b20fd9d10e4a7b673d59eeb9611a4eb5b00d9ba4) Signed-off-by: Ganesh Maharaj Mahalingam
4fc2527 (Peng Tao, 3 weeks ago) sandbox: return ErrNoSuchContainer when failing to find a container
So that caller can determine that it is ENOENT-alike error.
Signed-off-by: Peng Tao (cherry picked from commit f5125421d085c92e816ee3a7aa7a9465c54d7ca7) Signed-off-by: Ganesh Maharaj Mahalingam
85bfcb0 (Xie Yongji, 5 weeks ago) agent: pass correct mount type to agent for ephemeral volumes
The "ephemeral" is just used to indicate ephemeral volumes in runtime. We should not pass it to agent. Instead, "bind" should be the correct mount type to be passed.
Fixes: #1438
Signed-off-by: Xie Yongji (cherry picked from commit 2d422a845bd51a871df5ce7fe9d9cac4dcf278a6) Signed-off-by: Ganesh Maharaj Mahalingam
该提问来源于开源项目：kata-containers/runtime
