2.0.0

2 files changed, 26 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 895e563a5b56..25d0c97ba628 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,24 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (binary version)
-	pkgver = 1.11.3
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-containers-image-1.11.3-7.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-ksm-throttler-1.11.3-7.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-linux-container-5.4.32.75-7.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-proxy-bin-1.11.3-7.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-runtime-1.11.3-7.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/Fedora_30/x86_64/kata-shim-bin-1.11.3-7.1.x86_64.rpm
-	sha256sums = 0f791db850f54da333b0a106f5ed205c3ac00176b3d7b4c6be546cceff1aa04d
-	sha256sums = 1e108b6e233a0d34d8a130b75828644ff6a0d345eba05e0ded90121aa3371138
-	sha256sums = 45d210b29d6d11b9d9c62f55ec5b323a431016e6c872a24d5bf3e991fcd03ef0
-	sha256sums = 41e0661d9004d246b79b13f5854e93222b1415e2e50258477864ce4b73fd7ba9
-	sha256sums = d0af42580d0c37cf0adefbb395f6b40b0ea134fdc8a7cdb925971c36649d2760
-	sha256sums = 7adbd10bde3aee469087250ccab7b48f2cdb3e291872f76a2469f8ff917191e3
+	source = https://github.com/kata-containers/kata-containers/releases/download/2.0.0/kata-static-2.0.0-x86_64.tar.xz
+	sha512sums = a201f14d4e88307a8959b158aeaa2789906a913c0463aa60a6124befcb5f6e6c9b107c6cd30e0f3392901c6727972083b9261ec1b4d2d4755c58fa6c6106eca9
+	b2sums = 7bd43eb6facb6012b9c02613588683bea6fe8b3e1cbeb828bdabb7df815acd7c6c6cd9dc85ccc8956d1c304c342a33b356706947f4801c28b3f035b1403d2936
 
 pkgname = kata-runtime-bin
 	install = kata-runtime.install
 	depends = qemu-headless
-	depends = kata-proxy
-	depends = kata-shim
-	depends = kata-ksm-throttler
 	depends = kata-containers-image
 	depends = kata-linux-container
-	optdepends = cloud-hypervisor<0.8.0
+	optdepends = cloud-hypervisor<0.11.0
 	optdepends = firecracker<0.22.0
 	provides = kata-runtime
 	conflicts = kata-runtime
 
-pkgname = kata-proxy-bin
-	provides = kata-proxy
-	conflicts = kata-proxy
-
-pkgname = kata-shim-bin
-	provides = kata-shim
-	conflicts = kata-shim
-
 pkgname = kata-containers-image-bin
 	provides = kata-containers-image
 	conflicts = kata-containers-image
@@ -47,7 +27,3 @@ pkgname = kata-linux-container-bin
 	provides = kata-linux-container
 	conflicts = kata-linux-container
 
-pkgname = kata-ksm-throttler-bin
-	provides = kata-ksm-throttler
-	conflicts = kata-ksm-throttler
-
diff --git a/PKGBUILD b/PKGBUILD
index ffb1c37e1307..e05e6ad48e3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,10 @@
 pkgbase=kata-containers-bin
 pkgname=(
   kata-runtime-bin
-  kata-proxy-bin
-  kata-shim-bin
   kata-containers-image-bin
   kata-linux-container-bin
 )
-pkgver="1.11.3"
+pkgver="2.0.0"
 _pkgver=${pkgver/\~/-}
 pkgrel=1
 pkgdesc="Lightweight virtual machines for containers (binary version)"
@@ -19,12 +17,13 @@ arch=(x86_64)
 url="https://katacontainers.io"
 license=('Apache')
 
-_bin_pkg_root="/usr"  # `/usr` for f30 packages, `/opt/kata` for static packages
+_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/runtime/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
-  sha256sums=(6a2f67fca6f896502a6b3ba8b7518cabff26cb4448e0f529cbefe4039909758f)
+  #pkgname+=(kata-containers-static)
+  source=("https://github.com/kata-containers/kata-containers/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz")
+  sha512sums=(a201f14d4e88307a8959b158aeaa2789906a913c0463aa60a6124befcb5f6e6c9b107c6cd30e0f3392901c6727972083b9261ec1b4d2d4755c58fa6c6106eca9)
+  b2sums=(7bd43eb6facb6012b9c02613588683bea6fe8b3e1cbeb828bdabb7df815acd7c6c6cd9dc85ccc8956d1c304c342a33b356706947f4801c28b3f035b1403d2936)
 else
   _kata_kernel_ver="5.4.32.75"
   _default_suffix="-7.1"  # f30 package build revision
@@ -35,29 +34,33 @@ else
   #_runtime_suffix="-6.1"
   #_shim_suffix="-6.1"
 
-  pkgname+=(kata-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"
   )
-  sha256sums=(
-    0f791db850f54da333b0a106f5ed205c3ac00176b3d7b4c6be546cceff1aa04d
-    1e108b6e233a0d34d8a130b75828644ff6a0d345eba05e0ded90121aa3371138
-    45d210b29d6d11b9d9c62f55ec5b323a431016e6c872a24d5bf3e991fcd03ef0
-    41e0661d9004d246b79b13f5854e93222b1415e2e50258477864ce4b73fd7ba9
-    d0af42580d0c37cf0adefbb395f6b40b0ea134fdc8a7cdb925971c36649d2760
-    7adbd10bde3aee469087250ccab7b48f2cdb3e291872f76a2469f8ff917191e3
+  sha512sums=(
+    70aaad6efc468baa2ef05f971b4c755f9035d83e2ac4dcdf3b53ff95c58a8fa5063d2427a585e8657801b78d290b0362480d05c987b093f69c969566dff99036
+    618f8272360f2f5685f1bd3bc1a05df42a4229387cda9ca7b2ca6846a9974eee4d1f85fd46b62f8d65a014f64f257922601f65d5a489e83d6220af1426e2e137
+    4a7b3650d3747633f44dcb3c6a7d6258c2aa70e169c10f7e686b5772c467eb0bb69f91370c4546d11a81311fe0d69428c7f4db75e0c665e2673f6282e1abeb71
+    37ed3a0799f3d54d8917125a9713c297256cb952c3e53314ff51ace2b8eaa0093e16596dfd0448a101bc555697d4c5a750c7d789d19016dce04e15beb051bbaa
+    1d37f6ff64a7d2cbb097b4157da3200559bf6ca301727a4af1f04c87c739626c17a9e558acd54dc58a83656ec83cf0ffa8c5f70d6ed1d4f316fe662717d76902
+  )
+  b2sums=(
+    fed5a77db2301cac9f60ed6094456911d941644eeb65eb83fb4b1b240638f9c5e8f6b29f73f5533b66b83299106109b490607f1a0302ba29e8d50e78a46761f9
+    694ba5743566052bfe26629ceb040c252b966e03b8231fd63b5287121f7a4a4825948e6723142a92705dad84968cfc8c37d10dbca8a3b90c16798d2708d13706
+    19bddd80d61aed3723abae649c0ea3de8deba49a544ead288ccc41efb73c173b54b7cbaf50358ec673b267ff04c099f9556a26db2a56f42edefbe252471a4865
+    58bfbc87ae6f48938138b05008dc855beb7df208bf80ca0c30a7f4b6e9d17ff035b8bf0f15e06e0cf7dcd668b44756945939c9d1b3622443274e4229e2316e84
+    ff2b46172c09a458180b4addb0ce2dc512a568a61ae5c29fc3d75a07ae75c513e2a8a2355cdae5992c6e5c433421ea93b943a5be68391f796439790bb3402aed
   )
 fi
 
 package_kata-runtime-bin() {
-  depends=(qemu-headless kata-proxy kata-shim kata-ksm-throttler kata-containers-image kata-linux-container)
+  depends=(qemu-headless kata-containers-image kata-linux-container)
   optdepends=(
-    'cloud-hypervisor<0.8.0'
+    'cloud-hypervisor<0.11.0'
     'firecracker<0.22.0'
   )
   conflicts=('kata-runtime')
@@ -73,18 +76,6 @@ package_kata-runtime-bin() {
   sed -i -e 's/qemu-lite/qemu/' -e 's/qemu-vanilla/qemu/' ${pkgdir}/usr/share/defaults/kata-containers/configuration.toml ${pkgdir}/usr/bin/kata-collect-data.sh
 }
 
-package_kata-proxy-bin() {
-  conflicts=('kata-proxy')
-  provides=('kata-proxy')
-  install -D -m 0755 {${srcdir}${_bin_pkg_root}/libexec,${pkgdir}/usr/lib}/kata-containers/kata-proxy
-}
-
-package_kata-shim-bin() {
-  conflicts=('kata-shim')
-  provides=('kata-shim')
-  install -D -m 0755 {${srcdir}${_bin_pkg_root}/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
-}
-
 package_kata-containers-image-bin(){
   conflicts=('kata-containers-image')
   provides=('kata-containers-image')
@@ -112,16 +103,6 @@ package_kata-linux-container-bin(){
   ln -s vmlinuz-[0-9].[0-9]* vmlinuz.container
 }
 
-package_kata-ksm-throttler-bin() {
-  conflicts=('kata-ksm-throttler')
-  provides=('kata-ksm-throttler')
-  install -D -m 0644 -t ${pkgdir}/usr/lib/systemd/system ${srcdir}/usr/lib/systemd/system/kata-{ksm,vc}-throttler.service
-  sed -i 's/libexec/lib/' ${pkgdir}/usr/lib/systemd/system/kata-{ksm,vc}-throttler.service
-  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-ksm-throttler/kata-ksm-throttler
-  install -D -m 0755 {${srcdir}/usr/libexec,${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_kata-containers-static(){
   cp -dr --no-preserve='ownership' "${srcdir}/opt" "${pkgdir}/opt"
 }