Remove nemu due to deprecation upstream in upcoming RC. Updated instructions for Firecracker.

3 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9604598458e9..f09cd8b84a82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kata-containers
 	pkgdesc = Lightweight virtual machines for containers
 	pkgver = 1.9.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
@@ -26,8 +26,7 @@ pkgname = kata-runtime
 	depends = kata-ksm-throttler=1.9.2
 	depends = kata-containers-image=1.9.2
 	depends = kata-linux-container=1.9.2
-	optdepends = nemu
-	optdepends = firecracker-git
+	optdepends = firecracker<0.19.0
 
 pkgname = kata-proxy
 
diff --git a/PKGBUILD b/PKGBUILD
index 84c6a5210bd8..90b3f15df74a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=kata-containers
 pkgname=(kata-runtime kata-proxy kata-shim kata-ksm-throttler kata-containers-image kata-linux-container)
 pkgver="1.9.2"
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight virtual machines for containers"
 arch=(x86_64)
 url="https://katacontainers.io"
@@ -41,11 +41,7 @@ sha256sums=(
 
 package_kata-runtime() {
   depends=(qemu kata-proxy=${pkgver} kata-shim=${pkgver} kata-ksm-throttler=${pkgver} kata-containers-image=${pkgver} kata-linux-container=${pkgver})
-  optdepends=(
-      "nemu"
-      "firecracker-git"  # only until the package sets it's `provides` field
-      #"acrn"  # some day?
-  )
+  optdepends=('firecracker<0.19.0') # `acrn` some day?
   install=kata-runtime.install
 
   install -D -m 0755 -t ${pkgdir}/usr/bin ${srcdir}/usr/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
@@ -74,10 +70,10 @@ package_kata-ksm-throttler() {
 }
 
 package_kata-containers-image() {
-  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-image_clearlinux_1.9.2_agent_ba81eb84dd.img
-  ln -sf kata-containers-image_clearlinux_1.9.2_agent_ba81eb84dd.img ${pkgdir}/usr/share/kata-containers/kata-containers.img
-  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-initrd_alpine_1.9.2_agent_ba81eb84dd.initrd
-  ln -sf kata-containers-initrd_alpine_1.9.2_agent_ba81eb84dd.initrd ${pkgdir}/usr/share/kata-containers/kata-containers-initrd.img
+  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-image_clearlinux_${pkgver}_agent_ba81eb84dd.img
+  ln -sf kata-containers-image_clearlinux_${pkgver}_agent_ba81eb84dd.img ${pkgdir}/usr/share/kata-containers/kata-containers.img
+  install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-initrd_alpine_${pkgver}_agent_ba81eb84dd.initrd
+  ln -sf kata-containers-initrd_alpine_${pkgver}_agent_ba81eb84dd.initrd ${pkgdir}/usr/share/kata-containers/kata-containers-initrd.img
 }
 
 package_kata-linux-container() {
diff --git a/kata-runtime.install b/kata-runtime.install
index 4329e1e65ee9..707ece5b6aa2 100644
--- a/kata-runtime.install
+++ b/kata-runtime.install
@@ -19,7 +19,7 @@ To use kata-runtime with docker,
 $ docker run --runtime=kata --rm busybox date
 """
 
-- to set kata as the default runtime, add '"default-runtime": "kata"' to /etc/docker/daemon.json and restart the docker daemon
+- to set Kata as the default runtime, add '"default-runtime": "kata"' to /etc/docker/daemon.json and restart the docker daemon
 """
 {
     "default-runtime": "kata",
@@ -29,6 +29,14 @@ $ docker run --runtime=kata --rm busybox date
       },
     }
 }
+
+"""
+
+- to run Kata with Firecracker, due to Firecracker's limitations, you have to set your Docker storage driver (ref: https://docs.docker.com/storage/storagedriver/select-storage-driver/ ) to 'devicemapper'
+"""
+{
+    "storage-driver": "devicemapper"
+}
 """
 
 EOF