1.12.0

2 files changed, 33 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 107cebf6d55d..b8bdd7d4b951 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,14 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (binary version)
-	pkgver = 1.11.4
-	pkgrel = 3
+	pkgver = 1.12.0
+	pkgrel = 1
 	epoch = 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.4-8.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.4-8.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.76-9.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.4-8.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.4-8.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.4-8.1.x86_64.rpm
-	sha512sums = 7f0df542e9f24158d9ff81360591d3e30886437a2f21f3f8071e85b387f76dc7ac4bb4e46604b1aff368aa1d15a61eb354c35b071840b4ea2911020cc80be8ed
-	sha512sums = aee2c4423c0253d7f7983a693e325024d0365b799f761c2ae7fec72567df988a0df1f171ea3ea142899edb225e5cda5b43ca95fadd85f1c33a04ff0dc48a856c
-	sha512sums = 259247e7854aee7cf5d91abca365c516570afc700af04656a900306c1cfe497d7a4cb0e29f89944b083261f704d9a9daee521809ab6071639055768df7f7f61e
-	sha512sums = 1d14be901f418d0f5b0ace3e3604e45cdf6034d6f9b0e3c19a7d5aff9fabeb4b0ef57f8e5422a68ecc05785594d66ec9258e5490ab35a31f2ba825199e7b273e
-	sha512sums = 3c296414ae303673b23bf98110aa19d3ba00c6b7c9d867e82e199249a9074cd3028c512250b74e5a222c7eb642dc7b546ddae4dc3f0221464d75a374e8f73efd
-	sha512sums = 91d173106877db7d960a57463c369f92618c308d880215b4c0fdcc23218aaac19aa4cbe9b4c9c4e4984ff23bfb4e0686cc40401fe6f26d147a38c780f1d723b9
-	b2sums = bbfb6cebaedccc36904c46292365efe77d667c7b1fa4dc21a8358a760f4e3504a092e2ccbf3cdacad96ad14346aca6ef044ddbe9eb82c2bc69b2dc630bcb9359
-	b2sums = 4c16e67ea3be8db28ca2441d21123034f1a9ac4f9ae605b72f87c56a5c888a49e909a0810f0ba677e4c04ff014d3100ecee1a3210ac52bbdffa7d892159e2c78
-	b2sums = fa23a3b8a7e31c343c790ed4200db5ae15c1db4c6f0f03f9014dff1f7d79060cb0db95c5afa07148487f2a37e88b7f45a23a4c76cdfde6439fc61f7f36968e26
-	b2sums = 53bbdabfb6b08bbbe4ec4217c760ded2f2848cce42cee869b4cfad865e8ed0c16b769ba64a092a0353e69ca0e972d724412eae502bad2d54bf71e595d6c11a69
-	b2sums = fcd4a2e03c15c34bcf75cc3b7c600a52ac9acd1662cffa8b5c8619e4911f191a47664060d591aaaa24701cad7786a50f6ff5cf4f5f446dc2df2e290df1d1b65d
-	b2sums = 2406a674b822c98b36045c3c4270afd75d83b5b4c25e812e78885ad6433afc1776e0fb8c8a135ad3b0417af4f24b03f6edb86356e9808d97e3f53d3220fd8ce9
+	source = https://github.com/kata-containers/runtime/releases/download/1.12.0/kata-static-1.12.0-x86_64.tar.xz
+	sha512sums = 6a2835ef324de0c295e0ea009e7b66eb2008f02ee518b02a7f39dde50550f0a073c0ea2ab37b11c453c8812a2e10f422c6050aa40bcc04eb4d6e7c91d025822b
+	b2sums = de16963cd4ddaa83f9da677dff1c6b6b7ba2a14c8b9ed85228d8dc73074a66438806cc6998a0222cc7cfaddd0a2f35ff52c49d94513ca19cb452720b4d68d896
 
 pkgname = kata-runtime-bin
 	install = kata-runtime.install
@@ -54,7 +39,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 34fcbf38e828..3ab8fe395fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,21 +12,21 @@ pkgname=(
   kata-linux-container-bin
 )
 epoch=1
-pkgver="1.11.4"
+pkgver="1.12.0"
 _pkgver=${pkgver/\~/-}
-pkgrel=3
+pkgrel=1
 pkgdesc="Lightweight virtual machines for containers (binary version)"
 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")
-  sha512sums=(a201f14d4e88307a8959b158aeaa2789906a913c0463aa60a6124befcb5f6e6c9b107c6cd30e0f3392901c6727972083b9261ec1b4d2d4755c58fa6c6106eca9)
-  b2sums=(7bd43eb6facb6012b9c02613588683bea6fe8b3e1cbeb828bdabb7df815acd7c6c6cd9dc85ccc8956d1c304c342a33b356706947f4801c28b3f035b1403d2936)
+  sha512sums=(6a2835ef324de0c295e0ea009e7b66eb2008f02ee518b02a7f39dde50550f0a073c0ea2ab37b11c453c8812a2e10f422c6050aa40bcc04eb4d6e7c91d025822b)
+  b2sums=(de16963cd4ddaa83f9da677dff1c6b6b7ba2a14c8b9ed85228d8dc73074a66438806cc6998a0222cc7cfaddd0a2f35ff52c49d94513ca19cb452720b4d68d896)
 else
   _kata_kernel_ver="5.4.32.76"
   _default_suffix="-8.1"  # f30 package build revision
@@ -37,7 +37,7 @@ else
   #_runtime_suffix="-6.1"
   #_shim_suffix="-6.1"
 
-  pkgname+=(kata-ksm-throttler-bin)
+  #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"
@@ -79,8 +79,12 @@ package_kata-runtime-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 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
 
@@ -97,13 +101,17 @@ package_kata-runtime-bin() {
 package_kata-proxy-bin() {
   conflicts=('kata-proxy')
   provides=('kata-proxy')
-  install -D -m 0755 "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-proxy" "${pkgdir}/usr/lib/kata-containers/kata-proxy"
+  install -D -m 0755 \
+    "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-proxy" \
+    "${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/kata-containers/kata-shim" "${pkgdir}/usr/lib/kata-containers/kata-shim"
+  install -D -m 0755 \
+    "${srcdir}${_bin_pkg_root}/libexec/kata-containers/kata-shim" \
+    "${pkgdir}/usr/lib/kata-containers/kata-shim"
 }
 
 package_kata-containers-image-bin(){
@@ -142,9 +150,16 @@ package_kata-ksm-throttler-bin() {
   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"
+  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_kata-containers-static(){