From c4cea36448594828acb66a18ef593d63a35c215d Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 25 Jan 2023 16:29:14 +0100 Subject: [PATCH] app-emulation/cri-tools: sync with Gentoo Update to 1.24.2. Gentoo ref: 77516cb738fbcde38de8c8ebb20318a8a65df3f3 --- .../app-emulation/cri-tools/Manifest | 2 +- .../cri-tools/cri-tools-1.19.0.ebuild | 43 ------------------- .../cri-tools/cri-tools-1.24.2.ebuild | 34 +++++++++++++++ .../app-emulation/cri-tools/metadata.xml | 13 +++--- 4 files changed, 43 insertions(+), 49 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/Manifest index 5110256b01..519a794127 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/Manifest @@ -1 +1 @@ -DIST cri-tools-1.19.0.tar.gz 5199409 BLAKE2B ac8dde307cd1c2817bb303c1676ec7d9136d76dd62d73646c60d9695084edb630bff103f431c505da3ff51398994e0dbd3f68812ca8c1717c2af1b4bbc80b6ec SHA512 835660af08a44f918c36fd4bbd24e94e0c6183ed21fa2a0497df0ba28a2c79473ed945c4842e2a93e195f11895aceca3c9b978b5a66f8f058a40d3b7808a1b43 +DIST cri-tools-1.24.2.tar.gz 5968560 BLAKE2B 8dce8d16d5218aa73705b4a49b31391eaa25b21deb97f3dfe553f43d7371adf58206d9198f3e22e1c9cbcb7f41b832b0600b324d7c0f943ef313dc89900da46d SHA512 9b5907b37bb5f00295eff4fa4207ae55d930feae7e0f48fa130c7ecc936bcd259a11d59ed240684a3e12c8bcee40f2c67d7f4af52c2a76df3d7bf82e5e388a75 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild deleted file mode 100644 index 07e5cf53db..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit coreos-go - -COREOS_GO_PACKAGE="github.com/kubernetes-sigs/cri-tools" -COREOS_GO_MOD="vendor" - -MY_PV="v${PV/_beta/-beta.}" - -EGO_PN="${COREOS_GO_PACKAGE}" -DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)" -HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools" -SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" -# Flatcar: keyword arm64 -KEYWORDS="amd64 arm64" - -S=${WORKDIR}/cri-tools-${PV} - -DEPEND="" -RDEPEND="${DEPEND}" - -src_compile() { - # Flatcar: to optimize the binary size of crictl, make use of the existing - # helpers provided by `coreos-go.eclass`. - # Add "-X $(PROJECT)/pkg/version.Version=$(VERSION)" to GO_LDFLAGS, - # as the original cri-tools Makefile does. - # Note, we cannot run the native command like `emake crictl`, because - # the cri-tools Makefile does not allow custom env variables like BUILDTAGS - # or GO_LDFLAGS to be configured. - GO_LDFLAGS="-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs " - GO_LDFLAGS+="-X ${COREOS_GO_PACKAGE}/pkg/version.Version=${PV} " - go_build "${COREOS_GO_PACKAGE}/cmd/crictl" -} - -src_install() { - # Flatcar: install only crictl binary - dobin "${GOBIN}/crictl" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild new file mode 100644 index 0000000000..0ae021d253 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module + +DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)" +HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools" +SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-lang/go" + +RESTRICT+=" test" + +src_compile() { + emake VERSION="${PV}" + ./build/bin/crictl completion bash > "crictl.bash" || die + ./build/bin/crictl completion zsh > "crictl.zsh" || die +} + +src_install() { + dobin ./build/bin/crictl + + newbashcomp crictl.bash crictl + insinto /usr/share/zsh/site-functions + newins crictl.zsh _crictl + + dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/metadata.xml index ded6fbaced..8d6a4c5d53 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/metadata.xml @@ -1,8 +1,11 @@ - + - - - kubernetes-sigs/cri-tools - + + zmedico@gentoo.org + Zac Medico + + + kubernetes-sigs/cri-tools +