Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/
Date: Mon, 28 Mar 2022 05:35:26
Message-Id: 1648445696.b0c789e55fe279952eff475ff60cc1574ea5f917.williamh@gentoo
1 commit: b0c789e55fe279952eff475ff60cc1574ea5f917
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 05:34:56 2022 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 05:34:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c789e5
7
8 app-containers/containerd: add 1.5.11
9
10 Closes: https://bugs.gentoo.org/835367
11 Bug: https://bugs.gentoo.org/835917
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 app-containers/containerd/Manifest | 1 +
15 app-containers/containerd/containerd-1.5.11.ebuild | 84 ++++++++++++++++++++++
16 2 files changed, 85 insertions(+)
17
18 diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
19 index 7681b38a8cb9..ec595c999b3f 100644
20 --- a/app-containers/containerd/Manifest
21 +++ b/app-containers/containerd/Manifest
22 @@ -1,3 +1,4 @@
23 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
24 DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
25 +DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
26 DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
27
28 diff --git a/app-containers/containerd/containerd-1.5.11.ebuild b/app-containers/containerd/containerd-1.5.11.ebuild
29 new file mode 100644
30 index 000000000000..2d706c67b79c
31 --- /dev/null
32 +++ b/app-containers/containerd/containerd-1.5.11.ebuild
33 @@ -0,0 +1,84 @@
34 +# Copyright 2022 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=8
38 +GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8
39 +inherit go-module systemd
40 +
41 +DESCRIPTION="A daemon to control runC"
42 +HOMEPAGE="https://containerd.io/"
43 +SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
44 +
45 +LICENSE="Apache-2.0"
46 +SLOT="0"
47 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
48 +IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
49 +
50 +DEPEND="
51 + btrfs? ( sys-fs/btrfs-progs )
52 + seccomp? ( sys-libs/libseccomp )
53 +"
54 +
55 +# recommended version of runc is found in script/setup/runc-version
56 +RDEPEND="
57 + ${DEPEND}
58 + ~app-containers/runc-1.0.3
59 +"
60 +
61 +BDEPEND="
62 + dev-go/go-md2man
63 + virtual/pkgconfig
64 +"
65 +
66 +# tests require root or docker
67 +# upstream does not recommend stripping binary
68 +RESTRICT+=" strip test"
69 +
70 +src_prepare() {
71 + default
72 + sed -i \
73 + -e "s/-s -w//" \
74 + Makefile || die
75 + sed -i \
76 + -e "s:/usr/local:/usr:" \
77 + containerd.service || die
78 +}
79 +
80 +src_compile() {
81 + local options=(
82 + $(usev apparmor)
83 + $(usex btrfs "" "no_btrfs")
84 + $(usex cri "" "no_cri")
85 + $(usex device-mapper "" "no_devmapper")
86 + $(usev seccomp)
87 + $(usev selinux)
88 + )
89 +
90 + myemakeargs=(
91 + BUILDTAGS="${options[*]}"
92 + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
93 + REVISION="${GIT_REVISION}"
94 + VERSION=v${PV}
95 + )
96 +
97 + # race condition in man target https://bugs.gentoo.org/765100
98 + # we need to explicitly specify GOFLAGS for "go run" to use vendor source
99 + emake "${myemakeargs[@]}" man -j1 #nowarn
100 + emake "${myemakeargs[@]}" all
101 +
102 +}
103 +
104 +src_install() {
105 + dobin bin/*
106 + doman man/*
107 + newinitd "${FILESDIR}"/${PN}.initd "${PN}"
108 + systemd_dounit containerd.service
109 + keepdir /var/lib/containerd
110 +
111 + # we already installed manpages, remove markdown source
112 + # before installing docs directory
113 + rm -r docs/man || die
114 +
115 + local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
116 + einstalldocs
117 +}