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, 01 May 2019 22:27:26
Message-Id: 1556749632.69a0e83bf709b07c170da026e1f4cf5ee09d950d.zmedico@gentoo
1 commit: 69a0e83bf709b07c170da026e1f4cf5ee09d950d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 1 22:24:12 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed May 1 22:27:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a0e83b
7
8 app-emulation/cri-o: version bump to 1.13.7
9
10 Reported-by: Bruce Guenter <bruce <AT> untroubled.org>
11 Closes: https://bugs.gentoo.org/684898
12 Package-Manager: Portage-2.3.66, Repoman-2.3.12
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 app-emulation/cri-o/Manifest | 1 +
16 app-emulation/cri-o/cri-o-1.13.7.ebuild | 112 ++++++++++++++++++++++++++++++++
17 2 files changed, 113 insertions(+)
18
19 diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
20 index cb7d987023a..fd856a5b0ce 100644
21 --- a/app-emulation/cri-o/Manifest
22 +++ b/app-emulation/cri-o/Manifest
23 @@ -1,2 +1,3 @@
24 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
25 DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c SHA512 116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875
26 +DIST cri-o-1.13.7.tar.gz 6657183 BLAKE2B 8073211bb188bf6a03615fe5d3f931d45dee09bb506316e80c6b0914d3b798e77e194d6f31e74e314406af28c4a882e45250f8c6792c82d9b0e3cceb0750cf1a SHA512 5056f26decc96798738aa67350b0d7353ac025518c82e2591f4541284bbc3620976a97dcc805429adc748131f38d13edcdb77c3b6f1ba6b93f672637437acb10
27
28 diff --git a/app-emulation/cri-o/cri-o-1.13.7.ebuild b/app-emulation/cri-o/cri-o-1.13.7.ebuild
29 new file mode 100644
30 index 00000000000..a032de19c99
31 --- /dev/null
32 +++ b/app-emulation/cri-o/cri-o-1.13.7.ebuild
33 @@ -0,0 +1,112 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +EGIT_COMMIT="42585737f5eb59273e791e47ab1643e10862d67f"
40 +EGO_PN="github.com/kubernetes-sigs/${PN}"
41 +
42 +inherit golang-vcs-snapshot systemd
43 +
44 +DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
45 +HOMEPAGE="https://cri-o.io/"
46 +SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 +
48 +LICENSE="Apache-2.0"
49 +SLOT="0"
50 +KEYWORDS="~amd64"
51 +IUSE="btrfs +device-mapper ostree seccomp selinux"
52 +
53 +COMMON_DEPEND="
54 + app-crypt/gpgme:=
55 + app-emulation/runc
56 + dev-libs/glib:=
57 + dev-libs/libassuan:=
58 + dev-libs/libgpg-error:=
59 + net-firewall/conntrack-tools
60 + net-firewall/iptables
61 + net-misc/cni-plugins
62 + net-misc/socat
63 + sys-apps/iproute2
64 + btrfs? ( sys-fs/btrfs-progs )
65 + device-mapper? ( sys-fs/lvm2:= )
66 + ostree? ( dev-util/ostree )
67 + seccomp? ( sys-libs/libseccomp:= )
68 + selinux? ( sys-libs/libselinux:= )"
69 +DEPEND="
70 + ${COMMON_DEPEND}
71 + dev-go/go-md2man"
72 +RDEPEND="${COMMON_DEPEND}"
73 +S="${WORKDIR}/${P}/src/${EGO_PN}"
74 +
75 +src_prepare() {
76 + default
77 +
78 + sed -e '/^GIT_.*/d' \
79 + -e '/ git diff --exit-code/d' \
80 + -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
81 + -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
82 + -i Makefile || die
83 +
84 + echo ".NOTPARALLEL: binaries docs" >> Makefile || die
85 +
86 + sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
87 + -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
88 + -i Makefile.inc || 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/ostree_tag.sh ]] || die
104 + use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
105 + hack/ostree_tag.sh || die; }
106 +
107 + [[ -f hack/seccomp_tag.sh ]] || die
108 + use seccomp || { echo -e "#!/bin/sh\ntrue" > \
109 + hack/seccomp_tag.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 binaries docs
118 +}
119 +
120 +src_install() {
121 + emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
122 +
123 + keepdir /etc/crio
124 + insinto /etc/crio
125 + use seccomp && doins seccomp.json
126 +
127 + "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
128 + doins "${T}/crio.conf.example"
129 +
130 + newinitd "${FILESDIR}/crio.initd" crio
131 +
132 + insinto /etc/logrotate.d
133 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
134 +
135 + # Suppress crio log error messages triggered if these don't exist.
136 + keepdir /etc/containers/oci/hooks.d
137 + keepdir /usr/share/containers/oci/hooks.d
138 +
139 + # Suppress crio "Missing CNI default network" log message.
140 + keepdir /etc/cni/net.d
141 + insinto /etc/cni/net.d
142 + doins contrib/cni/99-loopback.conf
143 +
144 + systemd_dounit contrib/systemd/*
145 +}