mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-06 04:36:12 +02:00
Merge pull request #2415 from flatcar/dongsu/cri-tools-1.24
app-emulation/cri-tools: update to 1.24.2
This commit is contained in:
Dongsu Park
GitHub
commit
975a947ba6
@ -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
|
||||
|
||||
@ -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"
|
||||
}
|
||||
46
sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild
vendored
Normal file
46
sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.24.2.ebuild
vendored
Normal file
@ -0,0 +1,46 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# Flatcar: remove bash-completion, inherit coreos-go
|
||||
inherit go-module coreos-go
|
||||
|
||||
COREOS_GO_VERSION="go1.19"
|
||||
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/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"
|
||||
# Flatcar: keyword arm64
|
||||
KEYWORDS="amd64 arm64"
|
||||
|
||||
S=${WORKDIR}/cri-tools-${PV}
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
src_compile() {
|
||||
# Flatcar: make use of the existing helpers provided by `coreos-go.eclass`.
|
||||
# To optimize the binary size of crictl, add "-X" to GO_LDFLAGS,
|
||||
# like "-X $(PROJECT)/pkg/version.Version=$(VERSION)" in the original
|
||||
# Makefile of cri-tools. We cannot follow way of Gentoo ebuilds like `emake`,
|
||||
# because Makefile of cri-tools does not allow users to pass in ${GOARCH}.
|
||||
# Remove shell completions.
|
||||
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, remove shell completions.
|
||||
dobin "${GOBIN}/crictl"
|
||||
|
||||
dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
|
||||
}
|
||||
@ -1,8 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>zmedico@gentoo.org</email>
|
||||
<name>Zac Medico</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
- cri-tools ([1.24.2](https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.24.2))
|
||||
Loading…
x
Reference in New Issue
Block a user