1.10.0… sort of.

2 files changed, 48 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb224349f0e6..9fa1c7a79d3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,24 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (binary version)
-	pkgver = 1.10.0~rc0
-	pkgrel = 7
+	pkgver = 1.10.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.10/Fedora_30/x86_64/kata-ksm-throttler-1.10.0~rc0-3.1.x86_64.rpm
 	source = https://github.com/kata-containers/runtime/releases/download/1.10.0-rc0/kata-static-1.10.0-rc0-x86_64.tar.xz
-	sha256sums = a947effca82fd01f944418c94fb712684fafc65d4edf1aa3683617d0c80a15c1
+	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://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 = 811e333bf837cc8d67977705c1a5968b0f7b58760cf8756ecbf63cdc776e3095
+	sha256sums = d9fa74e78c62cc078c31a551feab22861e8c30da5e6b58d3ad81db1e03f73dc4
+	sha256sums = ea0061c4c48d058597345c3c98bc0219204cb8544774885f8f13f2040d0c00dc
+	sha256sums = a17ff2f49436f6a89099d94ac7086a37bceeb46ea80cf440ca5a9bfa1b44aa5e
+	sha256sums = a3b856b313db073bbcb7a3195bfad5c4570c365613638bbcf3ed1fc2e7f8622a
 
 pkgname = kata-runtime-bin
 	install = kata-runtime.install
diff --git a/PKGBUILD b/PKGBUILD
index 0b20c68d3936..d5386800bc39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,38 @@
 
 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~rc0"
+pkgver="1.10.0"
 _pkgver=${pkgver/\~/-}
-pkgrel=7
+pkgrel=1
 pkgdesc="Lightweight virtual machines for containers (binary version)"
 arch=(x86_64)
 url="https://katacontainers.io"
 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
+
 source=(
-  "https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}/kata-ksm-throttler-${pkgver}-3.1.${CARCH}.rpm"
-  "https://github.com/kata-containers/runtime/releases/download/${_pkgver}/kata-static-${_pkgver}-${CARCH}.tar.xz"
+  "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://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"
 )
 sha256sums=(
-  'a947effca82fd01f944418c94fb712684fafc65d4edf1aa3683617d0c80a15c1'
   'b8f3c5684db0b91063a86238fbce2e5cbd5769a86aa71e41c4cb1f44fea7811f'
+  '0f49409c3d92ec61a7af737622b1e6cde2e3cb76133bf54fafe8335d8342af45'
+  '811e333bf837cc8d67977705c1a5968b0f7b58760cf8756ecbf63cdc776e3095'
+  'd9fa74e78c62cc078c31a551feab22861e8c30da5e6b58d3ad81db1e03f73dc4'
+  'ea0061c4c48d058597345c3c98bc0219204cb8544774885f8f13f2040d0c00dc'
+  'a17ff2f49436f6a89099d94ac7086a37bceeb46ea80cf440ca5a9bfa1b44aa5e'
+  'a3b856b313db073bbcb7a3195bfad5c4570c365613638bbcf3ed1fc2e7f8622a'
 )
 
+
 package_kata-runtime-bin() {
   depends=(qemu-headless kata-proxy kata-shim kata-ksm-throttler kata-containers-image kata-linux-container)
   optdepends=(
@@ -32,10 +48,10 @@ package_kata-runtime-bin() {
   provides=('kata-runtime')
   install=kata-runtime.install
 
-  install -D -m 0755 -t ${pkgdir}/usr/bin ${srcdir}/opt/kata/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
-  install -D -m 0755 {${srcdir}/opt/kata/libexec,${pkgdir}/usr/lib}/kata-containers/kata-netmon
-  install -D -m 0644 {${srcdir}/opt/kata,${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 0755 -t ${pkgdir}/usr/bin ${srcdir}${_bin_pkg_root}/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
+  install -D -m 0755 {${srcdir}${_bin_pkg_root}/libexec,${pkgdir}/usr/lib}/kata-containers/kata-netmon
+  install -D -m 0644 {${srcdir}${_bin_pkg_root},${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
 
   sed -i 's/libexec/lib/' ${pkgdir}/usr/share/defaults/kata-containers/*.toml ${pkgdir}/usr/bin/kata-collect-data.sh
   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
@@ -44,13 +60,13 @@ package_kata-runtime-bin() {
 package_kata-proxy-bin() {
   conflicts=('kata-proxy')
   provides=('kata-proxy')
-  install -D -m 0755 {${srcdir}/opt/kata/libexec,${pkgdir}/usr/lib}/kata-containers/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}/opt/kata/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
+  install -D -m 0755 {${srcdir}${_bin_pkg_root}/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
 }
 
 package_kata-ksm-throttler-bin() {
@@ -65,8 +81,8 @@ package_kata-ksm-throttler-bin() {
 
 package_kata-containers-image(){
   install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
-    ${srcdir}/opt/kata/share/kata-containers/kata-containers-image_clearlinux_${_pkgver}_agent_*.img \
-    ${srcdir}/opt/kata/share/kata-containers/kata-containers-initrd_alpine_${_pkgver}_agent_*.initrd
+    ${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
   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
@@ -74,12 +90,12 @@ package_kata-containers-image(){
 
 package_kata-linux-container(){
   install -Dm644 -t "${pkgdir}/usr/share/kata-containers/" \
-    ${srcdir}/opt/kata/share/kata-containers/config-* \
-    ${srcdir}/opt/kata/share/kata-containers/vmlinux-* \
-    ${srcdir}/opt/kata/share/kata-containers/vmlinuz-*
+    ${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinux-* \
+    ${srcdir}${_bin_pkg_root}/share/kata-containers/vmlinuz-* \
+    #${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