Use binaries from the static bundle unless they don't exist there.

2 files changed, 9 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5d19573a4c1..178d9cdf1d6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,12 @@
 pkgbase = kata-containers-bin
 	pkgdesc = Lightweight virtual machines for containers (binary version)
 	pkgver = 1.10.0~rc0
-	pkgrel = 3
+	pkgrel = 4
 	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-runtime-1.10.0~rc0-3.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~rc0-3.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~rc0-3.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~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 = 5ba7a425d583a26860085bf3812b258b13f87495ccc769b12a9bbe289cbd1364
-	sha256sums = 9e986dc42483509e69f7fd6e22dd6e00fc1aa6c60890aeb4fb9e0552ed9bcce7
-	sha256sums = 512d515b6744aa7fbe91be7c388b4066c0443a3521649d2c44f43af9abc97ffc
 	sha256sums = a947effca82fd01f944418c94fb712684fafc65d4edf1aa3683617d0c80a15c1
 	sha256sums = 619c413c63c9e03837a433112f9432adf1bef69224b352ada2bdd0100f5a5a53
 
diff --git a/PKGBUILD b/PKGBUILD
index f813bc4d3efb..2b7267ede4dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,33 +7,16 @@ pkgbase=kata-containers-bin
 pkgname=(kata-runtime-bin kata-proxy-bin kata-shim-bin kata-ksm-throttler-bin kata-containers-image kata-linux-container)
 pkgver="1.10.0~rc0"
 _pkgver=${pkgver/\~/-}
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight virtual machines for containers (binary version)"
 arch=(x86_64)
 url="https://katacontainers.io"
 license=('Apache')
-
-__dlbase="https://download.opensuse.org/repositories/home:/katacontainers:/releases:/${CARCH}:/stable-${pkgver%.*}/Fedora_30/${CARCH}"
-__linux_container_ver="4.19.86.59"
-__default_suffix="-3.1"
-#__runtime_suffix="-7.1"
-#__proxy_suffix="-7.1"
-#__shim_suffix="-7.1"
-#__ksm_throttler_suffix="-7.1"
-
 source=(
-  "${__dlbase}/kata-runtime-${pkgver}${__runtime_suffix:-${__default_suffix}}.${CARCH}.rpm"
-  "${__dlbase}/kata-proxy-bin-${pkgver}${__proxy_suffix:-${__default_suffix}}.${CARCH}.rpm"
-  "${__dlbase}/kata-shim-bin-${pkgver}${__shim_suffix:-${__default_suffix}}.${CARCH}.rpm"
-  "${__dlbase}/kata-ksm-throttler-${pkgver}${__ksm_throttler_suffix:-${__default_suffix}}.${CARCH}.rpm"
+  "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"
 )
-
-# sha256sum kata-{runtime,{proxy,shim}-bin,ksm-throttler}-*.rpm | awk '{print $1}' | xargs -n1 -I{} -- echo "'{}'"
 sha256sums=(
-  '5ba7a425d583a26860085bf3812b258b13f87495ccc769b12a9bbe289cbd1364'
-  '9e986dc42483509e69f7fd6e22dd6e00fc1aa6c60890aeb4fb9e0552ed9bcce7'
-  '512d515b6744aa7fbe91be7c388b4066c0443a3521649d2c44f43af9abc97ffc'
   'a947effca82fd01f944418c94fb712684fafc65d4edf1aa3683617d0c80a15c1'
   '619c413c63c9e03837a433112f9432adf1bef69224b352ada2bdd0100f5a5a53'
 )
@@ -49,10 +32,10 @@ package_kata-runtime-bin() {
   provides=('kata-runtime')
   install=kata-runtime.install
 
-  install -D -m 0755 -t ${pkgdir}/usr/bin ${srcdir}/usr/bin/{containerd-shim-kata-v2,kata-runtime,kata-collect-data.sh}
-  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-netmon
-  install -D -m 0644 {${srcdir},${pkgdir}}/usr/share/bash-completion/completions/kata-runtime
-  install -D -m 0644 -t ${pkgdir}/usr/share/defaults/kata-containers ${srcdir}/usr/share/defaults/kata-containers/*.toml
+  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
 
   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
@@ -61,13 +44,13 @@ package_kata-runtime-bin() {
 package_kata-proxy-bin() {
   conflicts=('kata-proxy')
   provides=('kata-proxy')
-  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-proxy
+  install -D -m 0755 {${srcdir}/opt/kata/libexec,${pkgdir}/usr/lib}/kata-containers/kata-proxy
 }
 
 package_kata-shim-bin() {
   conflicts=('kata-shim')
   provides=('kata-shim')
-  install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
+  install -D -m 0755 {${srcdir}/opt/kata/libexec,${pkgdir}/usr/lib}/kata-containers/kata-shim
 }
 
 package_kata-ksm-throttler-bin() {