Date: Thursday, March 16, 2023 @ 07:53:11 Author: dvzrv Revision: 1420990
upgpkg: cri-tools 1.26.1-1: Upgrade to 1.26.1. Fix installation paths for binaries. Add fish completion file for crictl. Modified: cri-tools/trunk/PKGBUILD ----------+ PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-16 07:41:43 UTC (rev 1420989) +++ PKGBUILD 2023-03-16 07:53:11 UTC (rev 1420990) @@ -2,8 +2,8 @@ pkgbase=cri-tools pkgname=(crictl critest) -pkgver=1.26.0 -_commit=cf1c8287fcef4444226e54482bf3827e8f804421 # v1.26.0 +pkgver=1.26.1 +_commit=300f0781645f12437b43fba5dd232733e0f2f82f # v1.26.1 pkgrel=1 pkgdesc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)" arch=(x86_64) @@ -14,7 +14,7 @@ makedepends=(git go) # can only build from git: https://github.com/kubernetes-sigs/cri-tools/issues/676 source=( - git+https://github.com/kubernetes-sigs/$pkgbase#commit=$_commit + git+$url#commit=$_commit $pkgbase-1.24.1-makefile.patch ) sha512sums=('SKIP' @@ -42,8 +42,9 @@ mkdir -vp completions local _binary for _binary in crictl; do - $pkgbase/build/bin/$_binary completion bash > completions/$_binary - $pkgbase/build/bin/$_binary completion zsh > completions/_$_binary + $pkgbase/build/bin/linux/amd64/$_binary completion bash > completions/$_binary + $pkgbase/build/bin/linux/amd64/$_binary completion zsh > completions/_$_binary + $pkgbase/build/bin/linux/amd64/$_binary completion fish > completions/$_binary.fish done } @@ -50,10 +51,11 @@ package_crictl() { pkgdesc="A CLI for CRI-compatible container runtimes" - install -vDm 755 $pkgbase/build/bin/$pkgname -t "$pkgdir/usr/bin/" + install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/" # shell completion install -vDm 644 completions/$pkgname -t "$pkgdir/usr/share/bash-completion/completions/" install -vDm 644 completions/_$pkgname -t "$pkgdir/usr/share/zsh/site-functions/" + install -vDm 644 completions/$pkgname.fish -t "$pkgdir/usr/share/fish/completions/" # docs install -vDm 644 $pkgbase/docs/$pkgname.md -t "$pkgdir/usr/share/doc/$pkgname/" install -vDm 644 $pkgbase/docs/examples/*.{json,yaml} -t "$pkgdir/usr/share/doc/$pkgname/examples/" @@ -63,7 +65,7 @@ package_critest() { pkgdesc="A benchmarking CLI for CRI-compatible container runtimes" - install -vDm 755 $pkgbase/build/bin/$pkgname -t "$pkgdir/usr/bin/" + install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/" # docs install -vDm 644 $pkgbase/docs/{benchmark,validation}.md -t "$pkgdir/usr/share/doc/$pkgname/" install -vDm 644 $pkgbase/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname/"
