mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-10 13:19:08 +00:00
osbuilder: fix alpine agent build
Since we always build musl kata-agent, there is no need to build it inside a musl container. We can just build on the host and then copy the binary to the target rootfs. There are still a lot to clean up and it should be made so for ALL target distros instead of just alpine. But this is at least working for alpine first. Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
@@ -22,7 +22,7 @@ ifeq (,$(not_check_version))
|
||||
have_yq=$(shell if [ -x "$(GOPATH)/bin/yq" ]; then echo "true"; else echo ""; fi)
|
||||
ifeq (,$(have_yq))
|
||||
$(info INFO: yq was not found, installing it)
|
||||
install_yq=$(shell .ci/install-yq.sh)
|
||||
install_yq=$(shell ../../ci/install_yq.sh)
|
||||
endif
|
||||
ifneq (,$(install_yq))
|
||||
$(error "ERROR: install yq failed")
|
||||
|
@@ -6,7 +6,7 @@
|
||||
|
||||
all: | update-yaml generate-client-code
|
||||
MK_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
|
||||
YQ_INSTALLER := "$(MK_DIR)/../../../.ci/install-yq.sh"
|
||||
YQ_INSTALLER := "$(MK_DIR)/../../../../../ci/install_yq.sh"
|
||||
VERSIONS_FILE := "$(MK_DIR)/../../../../../versions.yaml"
|
||||
YQ := $(shell command -v yq 2> /dev/null)
|
||||
|
||||
@@ -22,7 +22,7 @@ generate-client-code: clean-generated-code
|
||||
|
||||
update-yaml:
|
||||
ifndef YQ
|
||||
$(MK_DIR)/../../../.ci/install-yq.sh
|
||||
$(MK_DIR)/../../../../../ci//install_yq.sh
|
||||
endif
|
||||
clh_version=$(shell yq r $(VERSIONS_FILE) assets.hypervisor.cloud_hypervisor.version); \
|
||||
curl -OL https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/$$clh_version/vmm/src/api/openapi/cloud-hypervisor.yaml
|
||||
|
Reference in New Issue
Block a user