From fcb0c3a663d46c7e8f1f093e27a32a30e9ff2811 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 8 Oct 2020 10:51:58 -0400
Subject: kata: cleanup runtime recipe

Some of the dependencies are no longer valid for the kata runtime
recipe.

This also drops hyperstart as a dependency. With this removal, we
need a replacement kernel and initrd for kata. That replacement
will happen in future commits.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 ...low-SKIP_GO_VERSION_CHECK-to-be-overriden.patch | 26 ++++++++++++++++++++++
 recipes-core/kata-containers/kata-runtime_git.bb   | 21 ++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 recipes-core/kata-containers/kata-runtime/0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch

(limited to 'recipes-core/kata-containers')

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..b92abeb3
--- /dev/null
+++ b/recipes-core/kata-containers/kata-runtime/0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch
@@ -0,0 +1,26 @@
+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
+
+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..403d552e 100644
--- a/recipes-core/kata-containers/kata-runtime_git.bb
+++ b/recipes-core/kata-containers/kata-runtime_git.bb
@@ -4,16 +4,20 @@ 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"
+SRCREV = "04c77eb20e9bd603cab5c711bcbe7c69db58b040"
 SRC_URI = "git://${GO_IMPORT}.git \
+           file://0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch \
           "
 RDEPENDS_${PN}-dev_append = "bash"
+
+CONTAINER_KERNEL ?= ""
+CONTAINER_INITRD ?= ""
 RDEPENDS_${PN} = " \
                  qemu \
-                 hyperstart \
+                 ${CONTAINER_KERNEL} \
+		 ${CONTAINER_INITRD} \
                  "
-
-# grpc
+DEPENDS += "yq-native"
 
 S = "${WORKDIR}/git"
 
@@ -28,6 +32,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 +42,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,11 +53,6 @@ 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/*"
-- 
cgit v1.2.3-54-g00ecf