Kata 1.x archived, move 2.x under main pkgbase.

4 files changed, 73 insertions, 181 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f7837a5ba94..44ff23c59513 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,30 @@
-pkgbase = kata1-containers-bin
-	pkgdesc = Lightweight virtual machines for containers (binary version)
-	pkgver = 1.12.1
+pkgbase = kata-containers-bin
+	pkgdesc = Lightweight virtual machines for containers (version 2, binary packaging)
+	pkgver = 2.1.0
 	pkgrel = 1
-	epoch = 1
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
-	source = https://github.com/kata-containers/runtime/releases/download/1.12.1/kata-static-1.12.1-x86_64.tar.xz
-	sha512sums = 4c81be66e2b310ef767f0c90b548f85f89f5521be9fd53c50a95e81750dfbff666595ef48ba9cece2cccc33c7fafb74db0589b4a10069abf2f8d172bda8516ae
-	b2sums = 902dd17f7bd4d955155c7d0f377905e15d1e2e02b358acb511dbccd83f950e91989f3dbb36cb30866a950ed57127d50e8fa2da21ffefd7f95a9f98e3fc7e4da4
+	source = https://github.com/kata-containers/kata-containers/releases/download/2.1.0/kata-static-2.1.0-x86_64.tar.xz
+	sha512sums = 47a5f9cf267194f1ea1a934b67c4dc7624aae36526c8494ead6c4c61df52b4718783fad6851283ecb38236cd89527cd4883dba348199316b017659777d1d3b20
+	b2sums = 65946f09728c65bff47d102fac54263834477f6a2582f95deea9ab7b35ecce8de4035ab0b9097ba6f1ed95e02b0f2385ae5361eb35a624fae30a607064d13a32
 
-pkgname = kata1-runtime-bin
-	install = kata-runtime.install
+pkgname = kata-runtime-bin
+	install = kata2-runtime.install
 	depends = qemu-headless
-	depends = kata1-proxy
-	depends = kata1-shim
-	depends = kata1-containers-image
-	depends = kata1-linux-container
-	optdepends = kata1-ksm-throttler
-	optdepends = cloud-hypervisor<0.11.0
-	optdepends = firecracker<0.22.0
-	provides = kata1-runtime
-	conflicts = kata1-runtime
+	depends = kata-containers-image
+	depends = kata-linux-container
+	optdepends = cloud-hypervisor<16.0
+	optdepends = firecracker<0.24.0
+	provides = kata-runtime
+	conflicts = kata-runtime
+	conflicts = kata-runtime
 
-pkgname = kata1-proxy-bin
-	provides = kata1-proxy
-	conflicts = kata1-proxy
+pkgname = kata-containers-image-bin
+	provides = kata-containers-image
+	conflicts = kata-containers-image
 
-pkgname = kata1-shim-bin
-	provides = kata1-shim
-	conflicts = kata1-shim
-
-pkgname = kata1-containers-image-bin
-	provides = kata1-containers-image
-	conflicts = kata1-containers-image
-
-pkgname = kata1-linux-container-bin
-	provides = kata1-linux-container
-	conflicts = kata1-linux-container
+pkgname = kata-linux-container-bin
+	provides = kata-linux-container
+	conflicts = kata-linux-container
 
diff --git a/PKGBUILD b/PKGBUILD
index 62c7eac66a83..701c8102b581 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,16 @@
 # Contributor: Kaushal M <kshlmster cat gmail dog com>
 # Contributor: Stefan Zwanenburg <stefan cat zwanenburg dog info>
 
-pkgbase=kata1-containers-bin
+pkgbase=kata-containers-bin
 pkgname=(
-  kata1-runtime-bin
-  kata1-proxy-bin
-  kata1-shim-bin
-  kata1-containers-image-bin
-  kata1-linux-container-bin
+  kata-runtime-bin
+  kata-containers-image-bin
+  kata-linux-container-bin
 )
-epoch=1
-pkgver="1.12.1"
+pkgver="2.1.0"
 _pkgver=${pkgver/\~/-}
 pkgrel=1
-pkgdesc="Lightweight virtual machines for containers (binary version)"
+pkgdesc="Lightweight virtual machines for containers (version 2, binary packaging)"
 arch=(x86_64)
 url="https://katacontainers.io"
 license=('Apache')
@@ -23,10 +20,10 @@ license=('Apache')
 _bin_pkg_root="/opt/kata"  # `/usr` for f30 packages, `/opt/kata` for static packages
 
 if [ "${_bin_pkg_root}" = "/opt/kata" ]; then
-  #pkgname+=(kata1-containers-static)
-  source=("https://github.com/kata-containers/runtime/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
-  sha512sums=(4c81be66e2b310ef767f0c90b548f85f89f5521be9fd53c50a95e81750dfbff666595ef48ba9cece2cccc33c7fafb74db0589b4a10069abf2f8d172bda8516ae)
-  b2sums=(902dd17f7bd4d955155c7d0f377905e15d1e2e02b358acb511dbccd83f950e91989f3dbb36cb30866a950ed57127d50e8fa2da21ffefd7f95a9f98e3fc7e4da4)
+  #pkgname+=(kata-containers-static)
+  source=("https://github.com/kata-containers/kata-containers/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
+  sha512sums=(47a5f9cf267194f1ea1a934b67c4dc7624aae36526c8494ead6c4c61df52b4718783fad6851283ecb38236cd89527cd4883dba348199316b017659777d1d3b20)
+  b2sums=(65946f09728c65bff47d102fac54263834477f6a2582f95deea9ab7b35ecce8de4035ab0b9097ba6f1ed95e02b0f2385ae5361eb35a624fae30a607064d13a32)
 else
   _kata_kernel_ver="5.4.32.76"
   _default_suffix="-8.1"  # f30 package build revision
@@ -37,86 +34,54 @@ else
   #_runtime_suffix="-6.1"
   #_shim_suffix="-6.1"
 
-  #pkgname+=(kata1-ksm-throttler-bin)
   source=(
     "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-containers-image-${pkgver}${_image_suffix:-${_default_suffix}}.${CARCH}.rpm"
-    "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-ksm-throttler-${pkgver}${_ksm_suffix:-${_default_suffix}}.${CARCH}.rpm"
     "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-linux-container-${_kata_kernel_ver}${_kernel_suffix:-${_default_suffix}}.${CARCH}.rpm"
     "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-proxy-bin-${pkgver}${_proxy_suffix:-${_default_suffix}}.${CARCH}.rpm"
     "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-runtime-${pkgver}${_runtime_suffix:-${_default_suffix}}.${CARCH}.rpm"
     "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-shim-bin-${pkgver}${_shim_suffix:-${_default_suffix}}.${CARCH}.rpm"
   )
   sha512sums=(
-    7f0df542e9f24158d9ff81360591d3e30886437a2f21f3f8071e85b387f76dc7ac4bb4e46604b1aff368aa1d15a61eb354c35b071840b4ea2911020cc80be8ed
-    aee2c4423c0253d7f7983a693e325024d0365b799f761c2ae7fec72567df988a0df1f171ea3ea142899edb225e5cda5b43ca95fadd85f1c33a04ff0dc48a856c
-    259247e7854aee7cf5d91abca365c516570afc700af04656a900306c1cfe497d7a4cb0e29f89944b083261f704d9a9daee521809ab6071639055768df7f7f61e
-    1d14be901f418d0f5b0ace3e3604e45cdf6034d6f9b0e3c19a7d5aff9fabeb4b0ef57f8e5422a68ecc05785594d66ec9258e5490ab35a31f2ba825199e7b273e
-    3c296414ae303673b23bf98110aa19d3ba00c6b7c9d867e82e199249a9074cd3028c512250b74e5a222c7eb642dc7b546ddae4dc3f0221464d75a374e8f73efd
-    91d173106877db7d960a57463c369f92618c308d880215b4c0fdcc23218aaac19aa4cbe9b4c9c4e4984ff23bfb4e0686cc40401fe6f26d147a38c780f1d723b9
+    70aaad6efc468baa2ef05f971b4c755f9035d83e2ac4dcdf3b53ff95c58a8fa5063d2427a585e8657801b78d290b0362480d05c987b093f69c969566dff99036
+    618f8272360f2f5685f1bd3bc1a05df42a4229387cda9ca7b2ca6846a9974eee4d1f85fd46b62f8d65a014f64f257922601f65d5a489e83d6220af1426e2e137
+    4a7b3650d3747633f44dcb3c6a7d6258c2aa70e169c10f7e686b5772c467eb0bb69f91370c4546d11a81311fe0d69428c7f4db75e0c665e2673f6282e1abeb71
+    37ed3a0799f3d54d8917125a9713c297256cb952c3e53314ff51ace2b8eaa0093e16596dfd0448a101bc555697d4c5a750c7d789d19016dce04e15beb051bbaa
+    1d37f6ff64a7d2cbb097b4157da3200559bf6ca301727a4af1f04c87c739626c17a9e558acd54dc58a83656ec83cf0ffa8c5f70d6ed1d4f316fe662717d76902
   )
   b2sums=(
-    bbfb6cebaedccc36904c46292365efe77d667c7b1fa4dc21a8358a760f4e3504a092e2ccbf3cdacad96ad14346aca6ef044ddbe9eb82c2bc69b2dc630bcb9359
-    4c16e67ea3be8db28ca2441d21123034f1a9ac4f9ae605b72f87c56a5c888a49e909a0810f0ba677e4c04ff014d3100ecee1a3210ac52bbdffa7d892159e2c78
-    fa23a3b8a7e31c343c790ed4200db5ae15c1db4c6f0f03f9014dff1f7d79060cb0db95c5afa07148487f2a37e88b7f45a23a4c76cdfde6439fc61f7f36968e26
-    53bbdabfb6b08bbbe4ec4217c760ded2f2848cce42cee869b4cfad865e8ed0c16b769ba64a092a0353e69ca0e972d724412eae502bad2d54bf71e595d6c11a69
-    fcd4a2e03c15c34bcf75cc3b7c600a52ac9acd1662cffa8b5c8619e4911f191a47664060d591aaaa24701cad7786a50f6ff5cf4f5f446dc2df2e290df1d1b65d
-    2406a674b822c98b36045c3c4270afd75d83b5b4c25e812e78885ad6433afc1776e0fb8c8a135ad3b0417af4f24b03f6edb86356e9808d97e3f53d3220fd8ce9
+    fed5a77db2301cac9f60ed6094456911d941644eeb65eb83fb4b1b240638f9c5e8f6b29f73f5533b66b83299106109b490607f1a0302ba29e8d50e78a46761f9
+    694ba5743566052bfe26629ceb040c252b966e03b8231fd63b5287121f7a4a4825948e6723142a92705dad84968cfc8c37d10dbca8a3b90c16798d2708d13706
+    19bddd80d61aed3723abae649c0ea3de8deba49a544ead288ccc41efb73c173b54b7cbaf50358ec673b267ff04c099f9556a26db2a56f42edefbe252471a4865
+    58bfbc87ae6f48938138b05008dc855beb7df208bf80ca0c30a7f4b6e9d17ff035b8bf0f15e06e0cf7dcd668b44756945939c9d1b3622443274e4229e2316e84
+    ff2b46172c09a458180b4addb0ce2dc512a568a61ae5c29fc3d75a07ae75c513e2a8a2355cdae5992c6e5c433421ea93b943a5be68391f796439790bb3402aed
   )
 fi
 
-package_kata1-runtime-bin() {
-  depends=(qemu-headless kata1-proxy kata1-shim kata1-containers-image kata1-linux-container)
+package_kata-runtime-bin() {
+  depends=(qemu-headless kata-containers-image kata-linux-container)
   optdepends=(
-    kata1-ksm-throttler
-    'cloud-hypervisor<0.11.0'
-    'firecracker<0.22.0'
+    'cloud-hypervisor<16.0'
+    'firecracker<0.24.0'
   )
-  conflicts=('kata1-runtime')
-  provides=('kata1-runtime')
-  install=kata-runtime.install
+  conflicts=('kata-runtime' 'kata-runtime')
+  provides=('kata-runtime')
+  install=kata2-runtime.install
 
-  install -D -m 0755 -t "${pkgdir}/usr/bin" \
-    "${srcdir}${_bin_pkg_root}/bin/containerd-shim-kata-v2" \
-    "${srcdir}${_bin_pkg_root}/bin/kata-runtime" \
-    "${srcdir}${_bin_pkg_root}/bin/kata-collect-data.sh"
-  install -D -m 0755 \
-    "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-netmon" \
-    "${pkgdir}/usr/lib/kata-containers/kata-netmon"
-  install -D -m 0644 \
-    "${srcdir}${_bin_pkg_root}/share/bash-completion/completions/kata-runtime" \
-    "${pkgdir}/usr/share/bash-completion/completions/kata-runtime"
-  install -D -m 0644 -t "${pkgdir}/usr/share/defaults/kata-containers" \
-    ${srcdir}${_bin_pkg_root}/share/defaults/kata-containers/*.toml
+  install -D -m 0755 -t ${pkgdir}/usr/bin \
+    ${srcdir}${_bin_pkg_root}/bin/containerd-shim-kata-v2 \
+    ${srcdir}${_bin_pkg_root}/bin/kata-runtime \
+    ${srcdir}${_bin_pkg_root}/bin/kata-collect-data.sh
+  install -D -m 0755 ${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-netmon ${pkgdir}/usr/lib/kata-containers/kata-netmon
+  install -D -m 0644 ${srcdir}${_bin_pkg_root}/share/bash-completion/completions/kata-runtime ${pkgdir}/usr/share/bash-completion/completions/kata-runtime
+  install -D -m 0644 -t ${pkgdir}/usr/share/defaults/kata-containers ${srcdir}${_bin_pkg_root}/share/defaults/kata-containers/*.toml
+  #install -D -m 0644 ${srcdir}${_bin_pkg_root}/share/kata-qemu/qemu/pvh.bin ${pkgdir}/usr/share/qemu/pvh.bin
 
-  sed -i \
-    -e "s;${_bin_pkg_root};/usr;" \
-    -e 's/libexec/lib/' \
-    -e 's/kata-qemu/qemu/' \
-    -e 's/qemu-lite/qemu/' \
-    -e 's/qemu-vanilla/qemu/' \
-    ${pkgdir}/usr/share/defaults/kata-containers/*.toml \
-    "${pkgdir}/usr/bin/kata-collect-data.sh"
+  sed -i -e "s;${_bin_pkg_root};/usr;" -e 's/libexec/lib/' -e 's/kata-qemu/qemu/' -e 's/qemu-lite/qemu/' -e 's/qemu-vanilla/qemu/' ${pkgdir}/usr/share/defaults/kata-containers/*.toml ${pkgdir}/usr/bin/kata-collect-data.sh
 }
 
-package_kata1-proxy-bin() {
-  conflicts=('kata1-proxy')
-  provides=('kata1-proxy')
-  install -D -m 0755 \
-    "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-proxy" \
-    "${pkgdir}/usr/lib/kata-containers/kata-proxy"
-}
-
-package_kata1-shim-bin() {
-  conflicts=('kata1-shim')
-  provides=('kata1-shim')
-  install -D -m 0755 \
-    "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-shim" \
-    "${pkgdir}/usr/lib/kata-containers/kata-shim"
-}
-
-package_kata1-containers-image-bin(){
-  conflicts=('kata1-containers-image')
-  provides=('kata1-containers-image')
+package_kata-containers-image-bin(){
+  conflicts=('kata-containers-image')
+  provides=('kata-containers-image')
   install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
     ${srcdir}${_bin_pkg_root}/share/kata-containers/kata-containers-image_clearlinux_${_pkgver}_agent_*.img \
     ${srcdir}${_bin_pkg_root}/share/kata-containers/kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd
@@ -125,43 +90,16 @@ package_kata1-containers-image-bin(){
   ln -s kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd kata-containers-initrd.img
 }
 
-package_kata1-linux-container-bin(){
-  conflicts=('kata1-linux-container')
-  provides=('kata1-linux-container')
+package_kata-linux-container-bin(){
+  conflicts=('kata-linux-container')
+  provides=('kata-linux-container')
   install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
     ${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinux-* \
     ${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinuz-*
   [ "${_bin_pkg_root}" = "/opt/kata" ] && install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
     ${srcdir}${_bin_pkg_root}/share/kata-containers/config-*
-  cd "${pkgdir}/usr/share/kata-containers/"
-  ln -sf vmlinux-virtio-fs-* vmlinux-virtiofs.container
-  ln -sf vmlinuz-virtio-fs-* vmlinuz-virtiofs.container
-  # bash-specific behavior?
-  ln -s vmlinux-[0-9].[0-9]* vmlinux.container
-  ln -s vmlinuz-[0-9].[0-9]* vmlinuz.container
-}
-
-package_kata1-ksm-throttler-bin() {
-  conflicts=('kata1-ksm-throttler')
-  provides=('kata1-ksm-throttler')
-  install -D -m 0644 -t "${pkgdir}/usr/lib/systemd/system" \
-    "${srcdir}/usr/lib/systemd/system/kata-ksm-throttler.service" \
-    "${srcdir}/usr/lib/systemd/system/kata-vc-throttler.service"
-  sed -i 's/libexec/lib/' \
-    "${pkgdir}/usr/lib/systemd/system/kata-ksm-throttler.service" \
-    "${pkgdir}/usr/lib/systemd/system/kata-vc-throttler.service"
-  install -D -m 0755 \
-    "${srcdir}/usr/libexec/kata-ksm-throttler/kata-ksm-throttler" \
-    "${pkgdir}/usr/lib/kata-ksm-throttler/kata-ksm-throttler"
-  install -D -m 0755 \
-    "${srcdir}/usr/libexec/kata-ksm-throttler/trigger/virtcontainers/vc" \
-    "${pkgdir}/usr/lib/kata-ksm-throttler/trigger/virtcontainers/vc"
-  install -d -m 0755 \
-    "${pkgdir}/var/lib/vc/firecracker" \
-    "${pkgdir}/var/lib/vc/sbs" \
-    "${pkgdir}/var/lib/vc/uuid"
 }
 
-package_kata1-containers-static(){
+package_kata-containers-static(){
   cp -dr --no-preserve='ownership' "${srcdir}/opt" "${pkgdir}/opt"
 }
diff --git a/kata-runtime.install b/kata-runtime.install
deleted file mode 100644
index bf29b5a97eae..000000000000
--- a/kata-runtime.install
+++ /dev/null
@@ -1,44 +0,0 @@
-post_install() {
-  cat <<EOF
-
-To use kata-runtime with docker,
-- add the following config to /etc/docker/daemon.json
-"""
-{
-    "runtimes": {
-      "kata": {
-        "path": "/usr/bin/kata-runtime"
-      }
-    }
-}
-"""
-  and restart the docker daemon
-
-- run containers with the "--runtime=kata" options to use kata-runtime
-"""
-$ 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
-"""
-{
-    "default-runtime": "kata",
-    "runtimes": {
-      "kata": {
-        "path": "/usr/bin/kata-runtime"
-      },
-    }
-}
-
-"""
-
-- 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' in /etc/docker/daemon.json
-"""
-{
-    "storage-driver": "devicemapper"
-}
-"""
-
-EOF
-
-}
diff --git a/kata2-runtime.install b/kata2-runtime.install
new file mode 100644
index 000000000000..cdf8a5a82615
--- /dev/null
+++ b/kata2-runtime.install
@@ -0,0 +1,9 @@
+post_install() {
+  cat <<EOF
+Due to Docker hard-codied usage of OCI runtime shim v1, the closest replacement
+is to call containerd CLI, for example as follows:
+
+  ctr image pull docker.io/library/alpine:edge
+  ctr run --rm -t --runtime io.containerd.kata.v2 docker.io/library/alpine:edge example-container-name date
+EOF
+}