Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/cri-o/
Date: Fri, 13 May 2022 20:39:53
Message-Id: 1652474385.8ab082aa2cb6b27275f65658a464e9a5f792dac5.zmedico@gentoo
1 commit: 8ab082aa2cb6b27275f65658a464e9a5f792dac5
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 13 20:39:27 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri May 13 20:39:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab082aa
7
8 app-containers/cri-o: add 1.24.0
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 app-containers/cri-o/Manifest | 1 +
13 app-containers/cri-o/cri-o-1.24.0.ebuild | 101 +++++++++++++++++++++++++++++++
14 2 files changed, 102 insertions(+)
15
16 diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
17 index 210a5042a133..c43c33352d75 100644
18 --- a/app-containers/cri-o/Manifest
19 +++ b/app-containers/cri-o/Manifest
20 @@ -46,6 +46,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb6
21 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
22 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
23 DIST cri-o-1.23.2.tar.gz 16010400 BLAKE2B 6298398b4d712227debc346ebe7a26dea6aa3d74e55fb9584cbe3fbeb85e62872e5e634be2812a4d51643d41d64b817bcc17ed8dfc0f0e55796608cc1ede347b SHA512 5080a0953c3b4e90a9e42606defe5f1e906533b9db66fa7daa823475e25a65040c442d06d591847ece3b1b7745a74cde938deac5c8bfd522dff25a2e76a07b1d
24 +DIST cri-o-1.24.0.tar.gz 15987447 BLAKE2B 0571c2719d3773fc1085e3fcecef959b210a601365686fd80262fe8ec5b9f2414641ed56f3fa6c6e21ff4cca1a3fecaa3ed5cd4de08799b2eb9b67fc0545d0f1 SHA512 0e0d7668098d90f1800c3763143c17721004f92355fc681cc7314d86d6d719788929c66ca06bab2ae3d3bbf77a5e95254458b7c79662e7aef5fc9548a4495504
25 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
26 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
27 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
28
29 diff --git a/app-containers/cri-o/cri-o-1.24.0.ebuild b/app-containers/cri-o/cri-o-1.24.0.ebuild
30 new file mode 100644
31 index 000000000000..d7e73167f803
32 --- /dev/null
33 +++ b/app-containers/cri-o/cri-o-1.24.0.ebuild
34 @@ -0,0 +1,101 @@
35 +# Copyright 1999-2022 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +EGIT_COMMIT=0ba47c9b3e52eee95d898be84500c38c9fe032c9
41 +
42 +inherit go-module
43 +
44 +DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
45 +HOMEPAGE="https://cri-o.io/"
46 +SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 +
48 +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
49 +SLOT="0"
50 +KEYWORDS="~amd64 ~arm64"
51 +IUSE="btrfs +device-mapper selinux systemd"
52 +
53 +COMMON_DEPEND="
54 + app-crypt/gpgme:=
55 + app-containers/conmon
56 + app-containers/runc
57 + dev-libs/glib:=
58 + dev-libs/libassuan:=
59 + dev-libs/libgpg-error:=
60 + net-firewall/conntrack-tools
61 + net-firewall/iptables
62 + net-misc/cni-plugins
63 + net-misc/socat
64 + sys-apps/iproute2
65 + sys-libs/libseccomp:=
66 + btrfs? ( sys-fs/btrfs-progs )
67 + device-mapper? ( sys-fs/lvm2:= )
68 + selinux? ( sys-libs/libselinux:= )
69 + systemd? ( sys-apps/systemd:= )"
70 +DEPEND="
71 + ${COMMON_DEPEND}
72 + dev-go/go-md2man"
73 +RDEPEND="${COMMON_DEPEND}
74 + !<app-containers/podman-1.3.2-r1"
75 +
76 +src_prepare() {
77 + default
78 +
79 + sed -e '/^export GOPROXY=/d' \
80 + -e '/^GIT_.*/d' \
81 + -e '/ git diff --exit-code/d' \
82 + -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
83 + -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
84 + -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
85 + -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
86 + -i Makefile || die
87 +
88 + echo ".NOTPARALLEL: binaries docs" >> Makefile || die
89 +
90 + sed -e 's:/usr/local/bin:/usr/bin:' \
91 + -i contrib/systemd/* || die
92 +}
93 +
94 +src_compile() {
95 + [[ -f hack/btrfs_installed_tag.sh ]] || die
96 + use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
97 + hack/btrfs_installed_tag.sh || die; }
98 +
99 + [[ -f hack/libdm_installed.sh ]] || die
100 + use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
101 + hack/libdm_installed.sh || die; }
102 +
103 + [[ -f hack/selinux_tag.sh ]] || die
104 + use selinux || { echo -e "#!/bin/sh\ntrue" > \
105 + hack/selinux_tag.sh || die; }
106 +
107 + mkdir -p bin || die
108 + emake all \
109 + GOBIN="${S}/bin" \
110 + GO_BUILD="go build ${GOFLAGS}" \
111 + GO_MD2MAN="$(which go-md2man)"
112 +}
113 +
114 +src_install() {
115 + emake install install.config install.systemd \
116 + DESTDIR="${D}" \
117 + GO_MD2MAN="$(which go-md2man)" \
118 + PREFIX="${D}${EPREFIX}/usr"
119 + keepdir /etc/crio
120 + mv "${ED}/etc/crio/crio.conf"{,.example} || die
121 +
122 + newinitd "${FILESDIR}/crio.initd" crio
123 +
124 + insinto /etc/logrotate.d
125 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
126 +
127 + # Suppress crio log error messages triggered if these don't exist.
128 + keepdir /etc/containers/oci/hooks.d
129 + keepdir /usr/share/containers/oci/hooks.d
130 +
131 + # Suppress crio "Missing CNI default network" log message.
132 + keepdir /etc/cni/net.d
133 + insinto /etc/cni/net.d
134 + doins contrib/cni/99-loopback.conf
135 +}