1 |
commit: 682e0ab4966d624d99be7e9a954e476e950be926 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 26 21:24:13 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 26 21:24:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682e0ab4 |
7 |
|
8 |
app-emulation/containerd: drop 1.4.6 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/802948 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
app-emulation/containerd/Manifest | 1 - |
14 |
app-emulation/containerd/containerd-1.4.6.ebuild | 84 ------------------------ |
15 |
2 files changed, 85 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest |
18 |
index 53d555771a6..090fef9f9e6 100644 |
19 |
--- a/app-emulation/containerd/Manifest |
20 |
+++ b/app-emulation/containerd/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143 |
23 |
DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b |
24 |
DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 |
25 |
|
26 |
diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild |
27 |
deleted file mode 100644 |
28 |
index 8e9b81b35d7..00000000000 |
29 |
--- a/app-emulation/containerd/containerd-1.4.6.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,84 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d |
38 |
-EGO_PN="github.com/containerd/${PN}" |
39 |
-inherit golang-vcs-snapshot toolchain-funcs |
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 ~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-emulation/runc-1.0.0_rc95 |
59 |
-" |
60 |
- |
61 |
-BDEPEND=" |
62 |
- dev-go/go-md2man |
63 |
- virtual/pkgconfig |
64 |
- test? ( ${RDEPEND} ) |
65 |
-" |
66 |
- |
67 |
-# tests require root or docker |
68 |
-# upstream does not recommend stripping binary |
69 |
-RESTRICT+=" strip test" |
70 |
- |
71 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
72 |
- |
73 |
-src_prepare() { |
74 |
- default |
75 |
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
76 |
- -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ |
77 |
- -e "s/-s -w//" \ |
78 |
- Makefile || die |
79 |
-} |
80 |
- |
81 |
-src_compile() { |
82 |
- local options=( |
83 |
- $(usev apparmor) |
84 |
- $(usex btrfs "" "no_btrfs") |
85 |
- $(usex cri "" "no_cri") |
86 |
- $(usex device-mapper "" "no_devmapper") |
87 |
- $(usev seccomp) |
88 |
- $(usev selinux) |
89 |
- ) |
90 |
- |
91 |
- myemakeargs=( |
92 |
- BUILDTAGS="${options[*]}" |
93 |
- LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" |
94 |
- ) |
95 |
- |
96 |
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
97 |
- export GOFLAGS="-v -x -mod=vendor" |
98 |
- # race condition in man target https://bugs.gentoo.org/765100 |
99 |
- emake "${myemakeargs[@]}" man -j1 #nowarn |
100 |
- emake "${myemakeargs[@]}" all |
101 |
-} |
102 |
- |
103 |
-src_install() { |
104 |
- dobin bin/* |
105 |
- doman man/* |
106 |
- newinitd "${FILESDIR}"/${PN}.initd "${PN}" |
107 |
- keepdir /var/lib/containerd |
108 |
- |
109 |
- # we already installed manpages, remove markdown source |
110 |
- # before installing docs directory |
111 |
- rm -r docs/man || die |
112 |
- |
113 |
- local DOCS=( README.md PLUGINS.md docs/. ) |
114 |
- einstalldocs |
115 |
-} |