Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit 1c75ebf

Browse files
dvzrvsvntogit
authored and
svntogit
committed
upgpkg: cri-tools 1.26.1-1: Upgrade to 1.26.1.
Fix installation paths for binaries. Add fish completion file for crictl. git-svn-id: file:///srv/repos/svn-community/svn@1420990 9fca08f4-af9d-4005-b8df-a31f2cc04f65
1 parent aa20525 commit 1c75ebf

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Diff for: trunk/PKGBUILD

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
pkgbase=cri-tools
44
pkgname=(crictl critest)
5-
pkgver=1.26.0
6-
_commit=cf1c8287fcef4444226e54482bf3827e8f804421 # v1.26.0
5+
pkgver=1.26.1
6+
_commit=300f0781645f12437b43fba5dd232733e0f2f82f # v1.26.1
77
pkgrel=1
88
pkgdesc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"
99
arch=(x86_64)
@@ -14,7 +14,7 @@ depends=(glibc)
1414
makedepends=(git go)
1515
# can only build from git: https://github.com/kubernetes-sigs/cri-tools/issues/676
1616
source=(
17-
git+https://github.com/kubernetes-sigs/$pkgbase#commit=$_commit
17+
git+$url#commit=$_commit
1818
$pkgbase-1.24.1-makefile.patch
1919
)
2020
sha512sums=('SKIP'
@@ -42,18 +42,20 @@ build() {
4242
mkdir -vp completions
4343
local _binary
4444
for _binary in crictl; do
45-
$pkgbase/build/bin/$_binary completion bash > completions/$_binary
46-
$pkgbase/build/bin/$_binary completion zsh > completions/_$_binary
45+
$pkgbase/build/bin/linux/amd64/$_binary completion bash > completions/$_binary
46+
$pkgbase/build/bin/linux/amd64/$_binary completion zsh > completions/_$_binary
47+
$pkgbase/build/bin/linux/amd64/$_binary completion fish > completions/$_binary.fish
4748
done
4849
}
4950

5051
package_crictl() {
5152
pkgdesc="A CLI for CRI-compatible container runtimes"
5253

53-
install -vDm 755 $pkgbase/build/bin/$pkgname -t "$pkgdir/usr/bin/"
54+
install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
5455
# shell completion
5556
install -vDm 644 completions/$pkgname -t "$pkgdir/usr/share/bash-completion/completions/"
5657
install -vDm 644 completions/_$pkgname -t "$pkgdir/usr/share/zsh/site-functions/"
58+
install -vDm 644 completions/$pkgname.fish -t "$pkgdir/usr/share/fish/completions/"
5759
# docs
5860
install -vDm 644 $pkgbase/docs/$pkgname.md -t "$pkgdir/usr/share/doc/$pkgname/"
5961
install -vDm 644 $pkgbase/docs/examples/*.{json,yaml} -t "$pkgdir/usr/share/doc/$pkgname/examples/"
@@ -63,7 +65,7 @@ package_crictl() {
6365
package_critest() {
6466
pkgdesc="A benchmarking CLI for CRI-compatible container runtimes"
6567

66-
install -vDm 755 $pkgbase/build/bin/$pkgname -t "$pkgdir/usr/bin/"
68+
install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
6769
# docs
6870
install -vDm 644 $pkgbase/docs/{benchmark,validation}.md -t "$pkgdir/usr/share/doc/$pkgname/"
6971
install -vDm 644 $pkgbase/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname/"

0 commit comments

Comments
 (0)