diff options
Diffstat (limited to 'recipes-core/kata-containers')
5 files changed, 58 insertions, 20 deletions
diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb index 3632ee52..de28235c 100644 --- a/recipes-core/kata-containers/kata-agent_git.bb +++ b/recipes-core/kata-containers/kata-agent_git.bb @@ -5,10 +5,12 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/agent/LICENSE;md5=86d3 GO_IMPORT = "github.com/kata-containers/agent" SRCREV = "e03f7d7453fabffb17e1540f28666c26178d3cbf" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ " -RDEPENDS_${PN}-dev_append = "bash" +RDEPENDS:${PN}-dev:append = "bash" + +SKIP_RECIPE[kata-agent] ?= "kata containers are currently broken, patches accepted" S = "${WORKDIR}/git" @@ -36,4 +38,4 @@ do_install() { deltask compile_ptest_base -FILES_${PN} += "${systemd_unitdir}/*"
\ No newline at end of file +FILES:${PN} += "${systemd_unitdir}/*" diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb index 8de0bfcf..d835e4d2 100644 --- a/recipes-core/kata-containers/kata-proxy_git.bb +++ b/recipes-core/kata-containers/kata-proxy_git.bb @@ -5,10 +5,13 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/proxy/LICENSE;md5=86d3 GO_IMPORT = "github.com/kata-containers/proxy" SRCREV = "1148847739f9a9f47b92e34e4f309dc109d4dba9" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ " -RDEPENDS_${PN}-dev_append = "bash" + +SKIP_RECIPE[kata-proxy] ?= "kata containers are currently broken, patches accepted" + +RDEPENDS:${PN}-dev:append = "bash" S = "${WORKDIR}/git" diff --git a/recipes-core/kata-containers/kata-runtime/0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch b/recipes-core/kata-containers/kata-runtime/0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch new file mode 100644 index 00000000..dde63478 --- /dev/null +++ b/recipes-core/kata-containers/kata-runtime/0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch @@ -0,0 +1,28 @@ +From 224fedda76bb1b741d09a129a5b43a85cb9ce182 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 7 Oct 2020 23:29:52 -0400 +Subject: [PATCH] makefile: allow SKIP_GO_VERSION_CHECK to be overriden + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 669c1bd1..4c40278a 100644 +--- a/src/github.com/kata-containers/runtime/Makefile ++++ b/src/github.com/kata-containers/runtime/Makefile +@@ -12,7 +12,7 @@ for file in /etc/os-release /usr/lib/os-release; do \ + fi \ + done) + +-SKIP_GO_VERSION_CHECK= ++#SKIP_GO_VERSION_CHECK= + include golang.mk + + #Get ARCH. +-- +2.19.1 + diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb index 4f250f19..c0d7c4cb 100644 --- a/recipes-core/kata-containers/kata-runtime_git.bb +++ b/recipes-core/kata-containers/kata-runtime_git.bb @@ -4,16 +4,22 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/runtime/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" GO_IMPORT = "github.com/kata-containers/runtime" -SRCREV = "f4cf2137be58c3778d87a8ee8e258e68d1ede888" -SRC_URI = "git://${GO_IMPORT}.git \ +SRCREV = "04c77eb20e9bd603cab5c711bcbe7c69db58b040" +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ + file://0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch \ " -RDEPENDS_${PN}-dev_append = "bash" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN}-dev:append = "bash" + +CONTAINER_KERNEL ?= "" +CONTAINER_INITRD ?= "" +RDEPENDS:${PN} = " \ qemu \ - hyperstart \ + ${CONTAINER_KERNEL} \ + ${CONTAINER_INITRD} \ " +DEPENDS += "yq-native" -# grpc +SKIP_RECIPE[kata-runtime] ?= "kata containers are currently broken, patches accepted" S = "${WORKDIR}/git" @@ -28,6 +34,8 @@ do_compile() { export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" cd ${S}/src/${GO_IMPORT} + + export SKIP_GO_VERSION_CHECK="1" oe_runmake runtime } @@ -36,7 +44,7 @@ do_install() { cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir} mkdir -p ${D}/${datadir}/defaults/kata-containers/ - cp ${WORKDIR}/git/src/${GO_IMPORT}/cli/config/configuration.toml ${D}/${datadir}/defaults/kata-containers/ + cp ${WORKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml sed -e 's|/usr/bin/qemu-lite-system-x86_64|/usr/bin/qemu-system-x86_64|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml sed -e 's|/usr/share/kata-containers/vmlinuz.container|/var/lib/hyper/kernel|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml @@ -47,13 +55,8 @@ do_install() { # /usr/share/defaults/kata-containers/configuration.toml: file /usr/libexec/kata-containers/kata-shim does not exist # fork/exec /usr/libexec/kata-containers/kata-proxy: no such file or directory - - #64 mknod /dev/kvm c 10 232 - #68 kata-runtime --log=/dev/stdout run --bundle /opt/container/cube-server foo - - } -FILES_${PN} += "${datadir}/defaults/kata-containers/*" +FILES:${PN} += "${datadir}/defaults/kata-containers/*" deltask compile_ptest_base diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb index fb55a8e7..8a7cb78a 100644 --- a/recipes-core/kata-containers/kata-shim_git.bb +++ b/recipes-core/kata-containers/kata-shim_git.bb @@ -5,10 +5,12 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/shim/LICENSE;md5=86d3f GO_IMPORT = "github.com/kata-containers/shim" SRCREV = "bcc35aeca3ef6fa0976005c9e93525906aefed2f" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ " -RDEPENDS_${PN}-dev_append = "bash" +SKIP_RECIPE[kata-shim] ?= "kata containers are currently broken, patches accepted" + +RDEPENDS:${PN}-dev:append = "bash" S = "${WORKDIR}/git" |