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: Fri, 06 Sep 2019 22:58:19
Message-Id: 1567810644.df4a6e6f9bbadd0dd77c5f2ce5e4447f764d4faa.zmedico@gentoo
1 commit: df4a6e6f9bbadd0dd77c5f2ce5e4447f764d4faa
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 22:57:24 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 22:57:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4a6e6f
7
8 app-emulation/cri-o: Bump to version 1.15.1
9
10 Package-Manager: Portage-2.3.75, Repoman-2.3.17
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/cri-o/Manifest | 1 +
14 app-emulation/cri-o/cri-o-1.15.1.ebuild | 107 ++++++++++++++++++++++++++++++++
15 2 files changed, 108 insertions(+)
16
17 diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
18 index 7bd5610901c..5f31325a077 100644
19 --- a/app-emulation/cri-o/Manifest
20 +++ b/app-emulation/cri-o/Manifest
21 @@ -4,3 +4,4 @@ DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 83a0d77245bc841a9f89c55c853b64e69cec124
22 DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d SHA512 2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
23 DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7 SHA512 afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94
24 DIST cri-o-1.15.0.tar.gz 12153225 BLAKE2B c2db397cb2660af62c53bb5b166854d43cab665f53979ea45e6352929f0070ce7a730d356c7e71edb376d89baa0f616d84fe71017a6d6ca4d6b1270196cc1804 SHA512 4d5460f1e476085523cd82136d80ef32de645a8e6dd2da3ba7b1575cfee9e8ed44de7c144a8338aeb379a6ba506350e10cfc6feb3317b34429d41cb5fe6e20c4
25 +DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97 SHA512 2b9122692d84e8a6832d7172782c41d354185809cd3fa999951485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
26
27 diff --git a/app-emulation/cri-o/cri-o-1.15.1.ebuild b/app-emulation/cri-o/cri-o-1.15.1.ebuild
28 new file mode 100644
29 index 00000000000..cfbec5e0e93
30 --- /dev/null
31 +++ b/app-emulation/cri-o/cri-o-1.15.1.ebuild
32 @@ -0,0 +1,107 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d"
39 +EGO_PN="github.com/cri-o/${PN}"
40 +
41 +inherit golang-vcs-snapshot
42 +
43 +DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
44 +HOMEPAGE="https://cri-o.io/"
45 +SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
46 +
47 +LICENSE="Apache-2.0"
48 +SLOT="0"
49 +KEYWORDS="~amd64"
50 +IUSE="btrfs +device-mapper selinux systemd"
51 +
52 +COMMON_DEPEND="
53 + app-crypt/gpgme:=
54 + app-emulation/runc
55 + dev-libs/glib:=
56 + dev-libs/libassuan:=
57 + dev-libs/libgpg-error:=
58 + net-firewall/conntrack-tools
59 + net-firewall/iptables
60 + net-misc/cni-plugins
61 + net-misc/socat
62 + sys-apps/iproute2
63 + sys-libs/libseccomp:=
64 + btrfs? ( sys-fs/btrfs-progs )
65 + device-mapper? ( sys-fs/lvm2:= )
66 + selinux? ( sys-libs/libselinux:= )
67 + systemd? ( sys-apps/systemd:= )"
68 +DEPEND="
69 + ${COMMON_DEPEND}"
70 +RDEPEND="${COMMON_DEPEND}
71 + !<app-emulation/libpod-1.3.2-r1"
72 +S="${WORKDIR}/${P}/src/${EGO_PN}"
73 +
74 +src_prepare() {
75 + default
76 +
77 + # Avoid network-sandbox violations since go-1.13
78 + rm go.mod || die
79 +
80 + sed -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 + -i Makefile || die
85 +
86 + echo ".NOTPARALLEL: binaries docs" >> Makefile || die
87 +
88 + sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
89 + -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
90 + -i Makefile.inc || die
91 +
92 + sed -e 's:/usr/local/bin:/usr/bin:' \
93 + -i contrib/systemd/* || die
94 +
95 + if ! use systemd; then
96 + sed -e 's| pkg-config --exists libsystemd-journal | false |' \
97 + -e 's| pkg-config --exists libsystemd | false |' \
98 + -i conmon/Makefile || die
99 + fi
100 +}
101 +
102 +src_compile() {
103 + [[ -f hack/btrfs_installed_tag.sh ]] || die
104 + use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
105 + hack/btrfs_installed_tag.sh || die; }
106 +
107 + [[ -f hack/libdm_installed.sh ]] || die
108 + use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
109 + hack/libdm_installed.sh || die; }
110 +
111 + [[ -f hack/selinux_tag.sh ]] || die
112 + use selinux || { echo -e "#!/bin/sh\ntrue" > \
113 + hack/selinux_tag.sh || die; }
114 +
115 + mkdir -p bin || die
116 + GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
117 + emake all
118 +}
119 +
120 +src_install() {
121 + emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
122 +
123 + keepdir /etc/crio
124 + mv "${ED}/etc/crio/crio.conf"{,.example} || die
125 +
126 + newinitd "${FILESDIR}/crio.initd" crio
127 +
128 + insinto /etc/logrotate.d
129 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
130 +
131 + # Suppress crio log error messages triggered if these don't exist.
132 + keepdir /etc/containers/oci/hooks.d
133 + keepdir /usr/share/containers/oci/hooks.d
134 +
135 + # Suppress crio "Missing CNI default network" log message.
136 + keepdir /etc/cni/net.d
137 + insinto /etc/cni/net.d
138 + doins contrib/cni/99-loopback.conf
139 +}