2.2.0

2 files changed, 28 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03488841378d..16a385b8ab80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (version 2, binary packaging)
-	pkgver = 2.1.0
-	pkgrel = 5
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
-	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
+	source = https://github.com/kata-containers/kata-containers/releases/download/2.2.0/kata-static-2.2.0-x86_64.tar.xz
+	sha512sums = 7691525fe223547fe55ae99cf93628ea57844ffc93df8ca6967d70fe303d239a4b2722c3e0e4ec971fd541e501a91aaeb6341973966207f4fec8141d794cda47
+	b2sums = 472f2c9fad081b848ea160cc2f427f94b8479c57c6865949d43cc50704ce093f5c261a1abba8ccc366e8395ff7d8b84fd16172e31ebd9fbc99ab626db73b5686
 
 pkgname = kata-runtime-bin
 	install = kata2-runtime.install
@@ -36,4 +36,3 @@ pkgname = linux-kata-bin
 	conflicts = kata2-linux-container
 	conflicts = linux-kata1
 	conflicts = kata1-linux-container
-
diff --git a/PKGBUILD b/PKGBUILD
index 8e599f98ccb1..a3569a651190 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,54 +8,20 @@ pkgname=(
   kata-runtime-bin
   kata-containers-image-bin
   linux-kata-bin
+  #kata-containers-static
 )
-pkgver="2.1.0"
+pkgver="2.2.0"
 _pkgver=${pkgver/\~/-}
-pkgrel=5
+pkgrel=1
 pkgdesc="Lightweight virtual machines for containers (version 2, binary packaging)"
 arch=(x86_64)
 url="https://katacontainers.io"
 license=('Apache')
 
-_bin_pkg_root="/opt/kata"  # `/usr` for f30 packages, `/opt/kata` for static packages
-
-if [ "${_bin_pkg_root}" = "/opt/kata" ]; then
-  #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
-  #_image_suffix="-6.1"
-  #_ksm_suffix="-6.1"
-  _kernel_suffix="-9.1"
-  #_proxy_suffix="-6.1"
-  #_runtime_suffix="-6.1"
-  #_shim_suffix="-6.1"
-
-  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-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=(
-    70aaad6efc468baa2ef05f971b4c755f9035d83e2ac4dcdf3b53ff95c58a8fa5063d2427a585e8657801b78d290b0362480d05c987b093f69c969566dff99036
-    618f8272360f2f5685f1bd3bc1a05df42a4229387cda9ca7b2ca6846a9974eee4d1f85fd46b62f8d65a014f64f257922601f65d5a489e83d6220af1426e2e137
-    4a7b3650d3747633f44dcb3c6a7d6258c2aa70e169c10f7e686b5772c467eb0bb69f91370c4546d11a81311fe0d69428c7f4db75e0c665e2673f6282e1abeb71
-    37ed3a0799f3d54d8917125a9713c297256cb952c3e53314ff51ace2b8eaa0093e16596dfd0448a101bc555697d4c5a750c7d789d19016dce04e15beb051bbaa
-    1d37f6ff64a7d2cbb097b4157da3200559bf6ca301727a4af1f04c87c739626c17a9e558acd54dc58a83656ec83cf0ffa8c5f70d6ed1d4f316fe662717d76902
-  )
-  b2sums=(
-    fed5a77db2301cac9f60ed6094456911d941644eeb65eb83fb4b1b240638f9c5e8f6b29f73f5533b66b83299106109b490607f1a0302ba29e8d50e78a46761f9
-    694ba5743566052bfe26629ceb040c252b966e03b8231fd63b5287121f7a4a4825948e6723142a92705dad84968cfc8c37d10dbca8a3b90c16798d2708d13706
-    19bddd80d61aed3723abae649c0ea3de8deba49a544ead288ccc41efb73c173b54b7cbaf50358ec673b267ff04c099f9556a26db2a56f42edefbe252471a4865
-    58bfbc87ae6f48938138b05008dc855beb7df208bf80ca0c30a7f4b6e9d17ff035b8bf0f15e06e0cf7dcd668b44756945939c9d1b3622443274e4229e2316e84
-    ff2b46172c09a458180b4addb0ce2dc512a568a61ae5c29fc3d75a07ae75c513e2a8a2355cdae5992c6e5c433421ea93b943a5be68391f796439790bb3402aed
-  )
-fi
+source=("https://github.com/kata-containers/kata-containers/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
+sha512sums=(7691525fe223547fe55ae99cf93628ea57844ffc93df8ca6967d70fe303d239a4b2722c3e0e4ec971fd541e501a91aaeb6341973966207f4fec8141d794cda47)
+b2sums=(472f2c9fad081b848ea160cc2f427f94b8479c57c6865949d43cc50704ce093f5c261a1abba8ccc366e8395ff7d8b84fd16172e31ebd9fbc99ab626db73b5686)
+b3sums=(f113a37df8ed945407229f289375d2f2f8c01b4ae526e3227fdebd7d4d19d2e4)
 
 package_kata-runtime-bin() {
   optdepends=(
@@ -70,36 +36,36 @@ package_kata-runtime-bin() {
   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 0644 ${srcdir}${_bin_pkg_root}/share/kata-qemu/qemu/pvh.bin ${pkgdir}/usr/share/qemu/pvh.bin
+    ${srcdir}/opt/kata/bin/containerd-shim-kata-v2 \
+    ${srcdir}/opt/kata/bin/kata-runtime \
+    ${srcdir}/opt/kata/bin/kata-collect-data.sh
+  install -D -m 0755 ${srcdir}/opt/kata/libexec/kata-containers/kata-netmon ${pkgdir}/usr/lib/kata-containers/kata-netmon
+  install -D -m 0644 ${srcdir}/opt/kata/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}/opt/kata/share/defaults/kata-containers/*.toml
+  #install -D -m 0644 ${srcdir}/opt/kata/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;/opt/kata;/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_kata-containers-image-bin(){
   conflicts=('kata2-containers-image')
   provides=('kata-containers-image' 'kata2-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
+    ${srcdir}/opt/kata/share/kata-containers/kata-clearlinux-latest.image \
+    ${srcdir}/opt/kata/share/kata-containers/kata-alpine-*.initrd
   cd "${pkgdir}/usr/share/kata-containers/"
-  ln -s kata-containers-image_clearlinux_${_pkgver}_agent_*.img kata-containers.img
-  ln -s kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd kata-containers-initrd.img
+  ln -s kata-clearlinux-latest.image kata-containers.img
+  ln -s kata-alpine-*.initrd kata-containers-initrd.img
 }
 
 package_linux-kata-bin(){
   provides=('linux-kata' 'kata-linux-container' 'kata2-linux-container')
   conflicts=('linux-kata' 'kata-linux-container' 'kata2-linux-container' 'linux-kata1' 'kata1-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-*
+    ${srcdir}/opt/kata/share/kata-containers/vmlinux-* \
+    ${srcdir}/opt/kata/share/kata-containers/vmlinuz-*
+  [ "/opt/kata" = "/opt/kata" ] && install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
+    ${srcdir}/opt/kata/share/kata-containers/config-*
 }
 
 package_kata-containers-static(){