1.10.0, for real this time.

2 files changed, 20 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fa1c7a79d3f..1a7dba992895 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,14 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (binary version)
 	pkgver = 1.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://katacontainers.io
 	arch = x86_64
 	license = Apache
-	source = https://github.com/kata-containers/runtime/releases/download/1.10.0-rc0/kata-static-1.10.0-rc0-x86_64.tar.xz
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-containers-image-1.10.0-4.1.x86_64.rpm
+	source = https://github.com/kata-containers/runtime/releases/download/1.10.0/kata-static-1.10.0-x86_64.tar.xz
 	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-ksm-throttler-1.10.0-4.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-linux-container-4.19.86.60-4.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-proxy-bin-1.10.0-4.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-runtime-1.10.0-4.1.x86_64.rpm
-	source = https://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.10/Fedora_30/x86_64/kata-shim-bin-1.10.0-4.1.x86_64.rpm
-	sha256sums = b8f3c5684db0b91063a86238fbce2e5cbd5769a86aa71e41c4cb1f44fea7811f
-	sha256sums = 0f49409c3d92ec61a7af737622b1e6cde2e3cb76133bf54fafe8335d8342af45
+	sha256sums = aa3cf95adc7bb476085d2cf47cb4ec1875fc59a477b8c47741244498985f60f3
 	sha256sums = 811e333bf837cc8d67977705c1a5968b0f7b58760cf8756ecbf63cdc776e3095
-	sha256sums = d9fa74e78c62cc078c31a551feab22861e8c30da5e6b58d3ad81db1e03f73dc4
-	sha256sums = ea0061c4c48d058597345c3c98bc0219204cb8544774885f8f13f2040d0c00dc
-	sha256sums = a17ff2f49436f6a89099d94ac7086a37bceeb46ea80cf440ca5a9bfa1b44aa5e
-	sha256sums = a3b856b313db073bbcb7a3195bfad5c4570c365613638bbcf3ed1fc2e7f8622a
 
 pkgname = kata-runtime-bin
 	install = kata-runtime.install
diff --git a/PKGBUILD b/PKGBUILD
index d5386800bc39..8662e3e87e8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=kata-containers-bin
 pkgname=(kata-runtime-bin kata-proxy-bin kata-shim-bin kata-ksm-throttler-bin kata-containers-image kata-linux-container kata-containers-static)
 pkgver="1.10.0"
 _pkgver=${pkgver/\~/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight virtual machines for containers (binary version)"
 arch=(x86_64)
 url="https://katacontainers.io"
@@ -15,25 +15,25 @@ license=('Apache')
 
 _default_suffix="-4.1"  # f30 package build revision
 _kata_kernel_ver="4.19.86.60"
-_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
 
 source=(
-  "https://github.com/kata-containers/runtime/releases/download/1.10.0-rc0/kata-static-1.10.0-rc0-${CARCH}.tar.xz"
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-containers-image-${pkgver}${_default_suffix}.${CARCH}.rpm"
+  "https://github.com/kata-containers/runtime/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz"
+  #"https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-containers-image-${pkgver}${_default_suffix}.${CARCH}.rpm"
   "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-ksm-throttler-${pkgver}${_default_suffix}.${CARCH}.rpm"
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-linux-container-${_kata_kernel_ver}${_default_suffix}.${CARCH}.rpm"
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-proxy-bin-${pkgver}${_default_suffix}.${CARCH}.rpm"
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-runtime-${pkgver}${_default_suffix}.${CARCH}.rpm"
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-shim-bin-${pkgver}${_default_suffix}.${CARCH}.rpm"
+  #"https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-linux-container-${_kata_kernel_ver}${_default_suffix}.${CARCH}.rpm"
+  #"https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-proxy-bin-${pkgver}${_default_suffix}.${CARCH}.rpm"
+  #"https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-runtime-${pkgver}${_default_suffix}.${CARCH}.rpm"
+  #"https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-shim-bin-${pkgver}${_default_suffix}.${CARCH}.rpm"
 )
 sha256sums=(
-  'b8f3c5684db0b91063a86238fbce2e5cbd5769a86aa71e41c4cb1f44fea7811f'
-  '0f49409c3d92ec61a7af737622b1e6cde2e3cb76133bf54fafe8335d8342af45'
+  'aa3cf95adc7bb476085d2cf47cb4ec1875fc59a477b8c47741244498985f60f3'
+  #'0f49409c3d92ec61a7af737622b1e6cde2e3cb76133bf54fafe8335d8342af45'
   '811e333bf837cc8d67977705c1a5968b0f7b58760cf8756ecbf63cdc776e3095'
-  'd9fa74e78c62cc078c31a551feab22861e8c30da5e6b58d3ad81db1e03f73dc4'
-  'ea0061c4c48d058597345c3c98bc0219204cb8544774885f8f13f2040d0c00dc'
-  'a17ff2f49436f6a89099d94ac7086a37bceeb46ea80cf440ca5a9bfa1b44aa5e'
-  'a3b856b313db073bbcb7a3195bfad5c4570c365613638bbcf3ed1fc2e7f8622a'
+  #'d9fa74e78c62cc078c31a551feab22861e8c30da5e6b58d3ad81db1e03f73dc4'
+  #'ea0061c4c48d058597345c3c98bc0219204cb8544774885f8f13f2040d0c00dc'
+  #'a17ff2f49436f6a89099d94ac7086a37bceeb46ea80cf440ca5a9bfa1b44aa5e'
+  #'a3b856b313db073bbcb7a3195bfad5c4570c365613638bbcf3ed1fc2e7f8622a'
 )
 
 
@@ -92,10 +92,10 @@ package_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-* \
-    #${srcdir}${_bin_pkg_root}/share/kata-containers/config-*
+    ${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
+  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