commit: 8873f14078aa3be68a7ec500f2898bdc5f63af57 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu May 8 13:18:09 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 8 23:45:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8873f140
app-containers/cri-tools: We can now determine the crictl directory Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> From: https://github.com/gentoo/gentoo/pull/41994 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/cri-tools/cri-tools-1.33.0.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app-containers/cri-tools/cri-tools-1.33.0.ebuild b/app-containers/cri-tools/cri-tools-1.33.0.ebuild index f189cded30e7..305a9474b453 100644 --- a/app-containers/cri-tools/cri-tools-1.33.0.ebuild +++ b/app-containers/cri-tools/cri-tools-1.33.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 go-module +inherit bash-completion-r1 go-env go-module DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)" HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"; @@ -17,16 +17,18 @@ RESTRICT="test" DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md ) src_compile() { + local GOOS=$(go-env_goos) + CRICTL="build/bin/${GOOS}/${GOARCH}/crictl" emake VERSION="${PV}" - find build/ -name crictl -exec cp {} build/bin/ \; || die - ./build/bin/crictl completion bash > "crictl.bash" || die - ./build/bin/crictl completion zsh > "crictl.zsh" || die + + "${CRICTL}" completion bash > crictl.bash || die + "${CRICTL}" completion zsh > crictl.zsh || die } src_install() { einstalldocs - dobin ./build/bin/crictl + dobin "${CRICTL}" newbashcomp crictl.bash crictl insinto /usr/share/zsh/site-functions newins crictl.zsh _crictl
