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-emulation/cri-o/
Date: Wed, 19 Aug 2020 16:39:55
Message-Id: 1597855182.e1831069e295b9a3cd213159de150f0dc8a4a838.zmedico@gentoo
1 commit: e1831069e295b9a3cd213159de150f0dc8a4a838
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 19 16:35:06 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 19 16:39:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1831069
7
8 app-emulation/cri-o: Bump to version 1.18.3
9
10 Reported-by: Konstantin (Qrator Labs) <kpp+gentoo <AT> qrator.net>
11 Bug: https://bugs.gentoo.org/720740
12 Bug: https://bugs.gentoo.org/737994
13 Package-Manager: Portage-3.0.4, Repoman-3.0.1
14 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 app-emulation/cri-o/Manifest | 1 +
17 app-emulation/cri-o/cri-o-1.18.3.ebuild | 95 +++++++++++++++++++++++++++++++++
18 2 files changed, 96 insertions(+)
19
20 diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
21 index ebf01ec2a21..3c47d5db492 100644
22 --- a/app-emulation/cri-o/Manifest
23 +++ b/app-emulation/cri-o/Manifest
24 @@ -5,3 +5,4 @@ DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 159bdf322540c3d49f44b1fc1106d1717706f7
25 DIST cri-o-1.16.3.tar.gz 12274620 BLAKE2B e297996184e765a89cc68adbb531eb249ad74804b05d233b4730fe56cb530e2d6d7f44ecf6939730a055acff43b0bdec13fd40583fcf003740e6dacc9770d868 SHA512 cf3d8748696e14a9fe7bb1f4e4ed5532a84367e1de42da89e1c85c33f249525a42000c74445b1f6859099a43d4076c4078efe5990a7e663795121d54d1ee1354
26 DIST cri-o-1.17.0.tar.gz 10528650 BLAKE2B ba1240e602be576eb74bd9dd0c7b5d0ae3c78172902c74725ce3b85b90c739a79cf260b9ab441bc632eba85951ff1968a946824dd20849bb9ccae268b76e3fec SHA512 08b1ede35d44dd72f7a20ef02e3d27198d349d05b3fd41fc319bfba44dafdaf1843c1a6b04cd4d07ad80b5d2022376a8173b7459658a3c22011970561a1af308
27 DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f SHA512 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332
28 +DIST cri-o-1.18.3.tar.gz 11210469 BLAKE2B 16a9ed89c594c082e18d5a08ba1f87eaed600b95baed1e36c5b718e9dbaf52c7b482dbf6dba94a1cbc5e02f3dc58f0f21236b6b11c65fa60666d654e28c793fd SHA512 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640
29
30 diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild b/app-emulation/cri-o/cri-o-1.18.3.ebuild
31 new file mode 100644
32 index 00000000000..f74c4b4386e
33 --- /dev/null
34 +++ b/app-emulation/cri-o/cri-o-1.18.3.ebuild
35 @@ -0,0 +1,95 @@
36 +# Copyright 1999-2020 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +EGIT_COMMIT=61de18161fb4ccda720768c001713592b5a04e46
42 +
43 +inherit go-module
44 +
45 +DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
46 +HOMEPAGE="https://cri-o.io/"
47 +SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
48 +
49 +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
50 +SLOT="0"
51 +KEYWORDS="~amd64"
52 +IUSE="btrfs +device-mapper selinux systemd"
53 +
54 +COMMON_DEPEND="
55 + app-crypt/gpgme:=
56 + app-emulation/conmon
57 + app-emulation/runc
58 + dev-libs/glib:=
59 + dev-libs/libassuan:=
60 + dev-libs/libgpg-error:=
61 + net-firewall/conntrack-tools
62 + net-firewall/iptables
63 + net-misc/cni-plugins
64 + net-misc/socat
65 + sys-apps/iproute2
66 + sys-libs/libseccomp:=
67 + btrfs? ( sys-fs/btrfs-progs )
68 + device-mapper? ( sys-fs/lvm2:= )
69 + selinux? ( sys-libs/libselinux:= )
70 + systemd? ( sys-apps/systemd:= )"
71 +DEPEND="
72 + ${COMMON_DEPEND}"
73 +RDEPEND="${COMMON_DEPEND}
74 + !<app-emulation/libpod-1.3.2-r1"
75 +
76 +src_prepare() {
77 + default
78 +
79 + sed -e '/^GIT_.*/d' \
80 + -e '/ git diff --exit-code/d' \
81 + -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
82 + -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
83 + -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
84 + -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
85 + -i Makefile || die
86 +
87 + echo ".NOTPARALLEL: binaries docs" >> Makefile || die
88 +
89 + sed -e 's:/usr/local/bin:/usr/bin:' \
90 + -i contrib/systemd/* || die
91 +}
92 +
93 +src_compile() {
94 + [[ -f hack/btrfs_installed_tag.sh ]] || die
95 + use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
96 + hack/btrfs_installed_tag.sh || die; }
97 +
98 + [[ -f hack/libdm_installed.sh ]] || die
99 + use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
100 + hack/libdm_installed.sh || die; }
101 +
102 + [[ -f hack/selinux_tag.sh ]] || die
103 + use selinux || { echo -e "#!/bin/sh\ntrue" > \
104 + hack/selinux_tag.sh || die; }
105 +
106 + mkdir -p bin || die
107 + GOBIN="${S}/bin" \
108 + emake all
109 +}
110 +
111 +src_install() {
112 + emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
113 +
114 + keepdir /etc/crio
115 + mv "${ED}/etc/crio/crio.conf"{,.example} || die
116 +
117 + newinitd "${FILESDIR}/crio.initd" crio
118 +
119 + insinto /etc/logrotate.d
120 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
121 +
122 + # Suppress crio log error messages triggered if these don't exist.
123 + keepdir /etc/containers/oci/hooks.d
124 + keepdir /usr/share/containers/oci/hooks.d
125 +
126 + # Suppress crio "Missing CNI default network" log message.
127 + keepdir /etc/cni/net.d
128 + insinto /etc/cni/net.d
129 + doins contrib/cni/99-loopback.conf
130 +}