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, 02 Jan 2023 22:22:28
Message-Id: 1672698106.26865b14e96ce7fddc9915b5495d51529c6a1645.williamh@gentoo
1 commit: 26865b14e96ce7fddc9915b5495d51529c6a1645
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 22:21:46 2023 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:21:46 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26865b14
7
8 app-containers/containerd: add 1.6.14
9
10 Bug: https://bugs.gentoo.org/884803
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 app-containers/containerd/Manifest | 2 +
14 app-containers/containerd/containerd-1.6.14.ebuild | 84 ++++++++++++++++++++++
15 2 files changed, 86 insertions(+)
16
17 diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
18 index 43c665dcbcc9..ffdeca01d6ba 100644
19 --- a/app-containers/containerd/Manifest
20 +++ b/app-containers/containerd/Manifest
21 @@ -1,2 +1,4 @@
22 +DIST containerd-1.6.14-deps.tar.xz 95727780 BLAKE2B 15782df59512ee66eacbbb65b21520edfe1ae13bf4324a7262b0731c9bf650b328c328a72cb3113d31f23ef87a74e45292a6282f8f07e79db750c1238943e203 SHA512 8db408f87924741b80b55f8e9099ab64da41021f1708ed3c156716de17dd92b2ca6cfa469b3c8d5545fbebd51f9eefcf62c57139de545762815a73eb772fbbec
23 +DIST containerd-1.6.14.tar.gz 8698335 BLAKE2B 5f088faa35ffbcfd2e62334c12f9c741e23199d6d9999e28c69ad21b760fb85f514ef70cfdeebbdfaab914a8905ea7dae989d9fc8da36f3e077196e14dd6a220 SHA512 d29e2fb4a43f12d7e196f95b59b2c55793a1848177fb64b8bd9a4fd299fe54680a26f8a809b1d63f653ed9f0b30c209fc39d46b78ac0914d3253a10e5d3b015b
24 DIST containerd-1.6.8-deps.tar.xz 96625924 BLAKE2B 773b7c660826648b4077d320cbb3b265129fdd81233ac4aeb833586c9f25707c62e338492fb9905010b160e3fa635069ca4220136bca344ce54d154ee074bdeb SHA512 d805fefc0500fe2156bd8c6a752f9d13cafe85b528454ddc6efc95b09e05548df666cf9136aa3169794a0f7cc8135b943da1b106eec7e3dbbc83938892d80ead
25 DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf586a2877b2899446a323e2e7ccf8a0ec9015277693f9b1bac6f663721117704e97031ce923ae62d27a8d7b882bdfd SHA512 c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba
26
27 diff --git a/app-containers/containerd/containerd-1.6.14.ebuild b/app-containers/containerd/containerd-1.6.14.ebuild
28 new file mode 100644
29 index 000000000000..e6a34e17a7f7
30 --- /dev/null
31 +++ b/app-containers/containerd/containerd-1.6.14.ebuild
32 @@ -0,0 +1,84 @@
33 +# Copyright 2022-2023 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +GIT_REVISION=9ba4b250366a5ddde94bb7c9d1def331423aa323
38 +inherit go-module systemd
39 +
40 +DESCRIPTION="A daemon to control runC"
41 +HOMEPAGE="https://containerd.io/"
42 +SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
43 +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
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.1.4
59 +"
60 +
61 +BDEPEND="
62 + dev-go/go-md2man
63 + virtual/pkgconfig
64 +"
65 +
66 +# tests require root or docker
67 +RESTRICT+="test"
68 +
69 +src_prepare() {
70 + default
71 + sed -i \
72 + -e "s/-s -w//" \
73 + Makefile || die
74 + sed -i \
75 + -e "s:/usr/local:/usr:" \
76 + containerd.service || die
77 +}
78 +
79 +src_compile() {
80 + local options=(
81 + $(usev apparmor)
82 + $(usex btrfs "" "no_btrfs")
83 + $(usex cri "" "no_cri")
84 + $(usex device-mapper "" "no_devmapper")
85 + $(usev seccomp)
86 + $(usev selinux)
87 + )
88 +
89 + myemakeargs=(
90 + BUILDTAGS="${options[*]}"
91 + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
92 + REVISION="${GIT_REVISION}"
93 + VERSION=v${PV}
94 + )
95 +
96 + # race condition in man target https://bugs.gentoo.org/765100
97 + # we need to explicitly specify GOFLAGS for "go run" to use vendor source
98 + emake "${myemakeargs[@]}" man -j1 #nowarn
99 + emake "${myemakeargs[@]}" all
100 +
101 +}
102 +
103 +src_install() {
104 + dobin bin/*
105 + doman man/*
106 + newinitd "${FILESDIR}"/${PN}.initd "${PN}"
107 + systemd_dounit containerd.service
108 + keepdir /var/lib/containerd
109 +
110 + # we already installed manpages, remove markdown source
111 + # before installing docs directory
112 + rm -r docs/man || die
113 +
114 + local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
115 + einstalldocs
116 +}