summaryrefslogtreecommitdiff
path: root/app-emulation/containerd
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/containerd')
-rw-r--r--app-emulation/containerd/Manifest25
-rw-r--r--app-emulation/containerd/containerd-1.2.10.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.2.12.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.2.13.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.2.6.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.2.7.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.3.0.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.3.1.ebuild56
-rw-r--r--app-emulation/containerd/containerd-1.3.2.ebuild55
-rw-r--r--app-emulation/containerd/containerd-1.3.4.ebuild55
-rw-r--r--app-emulation/containerd/containerd-1.3.7.ebuild4
-rw-r--r--app-emulation/containerd/files/containerd.initd8
-rw-r--r--app-emulation/containerd/files/containerd.initd-r126
-rw-r--r--app-emulation/containerd/metadata.xml4
14 files changed, 14 insertions, 555 deletions
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 8e516f68baaf..e089edc0b297 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,23 +1,4 @@
-AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf8d7420dde704174f237a9023a9546cfcb2a122bb74ef583119c9668b453f11612eed26aca55044132 SHA512 d0193e784c62070004e43a7d8b8834bbcd2eba51faa7f8505cea04e06740f5e4950e5c036aa32edf3f592c02f3dd9e65214a6adba8579bdf9c79ae556af94462
-AUX containerd.initd-r1 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
-DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec SHA512 14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
-DIST containerd-1.2.12.tar.gz 4990623 BLAKE2B 640ff03f74e94dd3f919d3c26015cebae1f316c910442db881cd999c92991b7011131f05501648e9f08b6e34d38e2aa6ee1065ae31550de88ad79d9cafa5687e SHA512 bcb4f94aea984c804e34137cab6aad252c01dc75d5e33ade5d1e533e4266fd0af67d2bf8aa85f0e6eba4e43756e84f884f1dec4c9febd66f8a3e3bc8cd3ac775
-DIST containerd-1.2.13.tar.gz 4993470 BLAKE2B 8a094745358ee60f37eeee826898668bbbad3dc8c02b20d29bc977dd99bcb78ca4cba0cda737caaa66bf827b09f38e5ad1357bc7cbc85c0c3bf21d7ff8d8eff8 SHA512 19504a7419595f75160de2b85c5ea505257dc9b58972545bc3d31c144d59c8255f7a3d326b2a96b4fe1b34fb27525db8f3aa61bad97b40a315591a16c240ca5b
-DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
-DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a040000b7b8777b3fbeb4c5b861caae4f6209c59c5 SHA512 b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
-DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
-DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
-DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
-DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
+AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
-EBUILD containerd-1.2.10.ebuild 1435 BLAKE2B 4b55020f19d1349c90c2faa063c59f161a9ce1c7f9a02aef795de49f8b6ec3229964c2726547b3ad803ea84c7d2ab12c6b7f7b8afd53181a6e2f06e3e4df41ae SHA512 138989a2beb954c4e2d1be54fab432f3e38838cbd18c6341b297afae0c896f7fc9f4d234d96c70af3faee5b9d53bc095a0637c1e8b44b682c6359078bc8b69b4
-EBUILD containerd-1.2.12.ebuild 1434 BLAKE2B b1f6f907d6502dc829780b2e6150dc0e523ea9138840e31e0c88862aa0d07f489966a78d081c208e51e57ee5383ecf5b02cae19f2dda542ab8a6616ea0aaddd6 SHA512 2c9d32a48c78e7dbbf7837dcef9ffaff7d2e5c8fec67da47aff3985a6f898134317e7a13e4f370eb681013238eb085ed7c49d35ba240729cc605731bb5bfa301
-EBUILD containerd-1.2.13.ebuild 1438 BLAKE2B f4fd763e2ce0a731cfd1f66c001365a55a660c070a828d4e0a0d23b308d7956ebfd4b17b71bdf9c6892f6fc40107fb3481cef97226db95ba7797854462dd2c6c SHA512 07dcffcc0c3c946a83fdf04db6b6b8148996b3bba682e53d33ba8e968e316c0e1cb9babc6502e07d8508d89a17dc98c1f19d973d1f04219432ae892f998ccfd6
-EBUILD containerd-1.2.6.ebuild 1435 BLAKE2B b2c719a4d015325bf79b071e7211e99509e7ac9ac43ddc5fca82c8b5b7eeb42d856b0b759189c770361d92c8e4cd28f180da7d7358d4e6dc8f4bccb67708ee15 SHA512 b9d2c5434e56b4f6e215ee4a8fe2e94b355e066caa62e6bb41b7f63010e2332d1219fb45d0af77276110f436093946c95276da5c79fc95699c338b41682952dc
-EBUILD containerd-1.2.7.ebuild 1436 BLAKE2B fadea431a169fd01c58bad3ec746ba521d8a4dac09031d62f1b4b0fd1f1821a815d725a71818294b756bc87b5c2afed6226ce4807e0074cf640a94c2b56af16b SHA512 5587fa22daa78de8661fa04dbc780458ffb42c4219e7ef9f0411c6922364d25726b64f72928f4d543ce9506a7eac21f98a77d680b1daba35a72b9b5996b33721
-EBUILD containerd-1.3.0.ebuild 1436 BLAKE2B 221c0f5bf08fcaa1c1956859fc59b8b69830e0e26a221842894d385faadf243f76b575c6a4920b621c679c4c8d025f7ecc679a49d1a70dff738298c281335237 SHA512 133d213aa8115df74f5282843d0a0dc0832f0ca4f320ab4ffa541e3f85f0eb6ba89f66421498a857986fac8b368265445c9d01595def2a613d85c7abadf85dcf
-EBUILD containerd-1.3.1.ebuild 1403 BLAKE2B 27f63eea492f0b4069edbd19692ef501cb79d227ac02623684c408fc33da1d974ca2f2dbd78cdc1c6af9269f146b77c37ff427aea47c5b578eafc3c8d0f81550 SHA512 829b2b8943714ffe79759acf7b40d279e24047a9e77858910f7f820a89331fba8b91a8968cf4a4469a7395c1bec990d27702d583a15d074bd765104942505bca
-EBUILD containerd-1.3.2.ebuild 1407 BLAKE2B 82b111b3749b2f67729854cb50367139a7ac0ca25bc552713f875c5a7d9f7daad9c80c4e6071c01d7e3145d41bd608d08b28b6fd32b1508a2ec8b2324ad3c8fb SHA512 85cb4c29b6d2a77b0c278882ceac51315e34f103491bb7f5c209667572917facfb4debfc4b822728d8316a9ec0f771c3f6cb75d4b5c1b4c1e35ef6ff69837d99
-EBUILD containerd-1.3.4.ebuild 1407 BLAKE2B 559bed738625533707473147c978b4ea26e7df2cf952e2e5c0dffa1499caefc8a7b956b40867e9c38516822e72dbc214327347e10a33c3acbe3fef7843cb083b SHA512 8529ff278c6a01393ce70a7f8ffb124323c6214a6d509571f479bd8c309f6f3537721c6fe9ac1b0c6898c5a69aa4539af2653ea49752875e567acacb16094a4f
-EBUILD containerd-1.3.7.ebuild 1980 BLAKE2B 18a5668b632031753d3424b531d246210f3f5edb864b7a641a58ec2011d83af24b8b4409d6d842fe3574cba5196cd02621f05bd8c3b27db91e13fac0fe7b4075 SHA512 3076c05d721347f1fc15866a73451c99e877e8ecffc66d8b491642e3d44bc723255d6c87d1b419e0adf43a55c82645cd9ea28513301717f01ad8c4de84850187
-MISC metadata.xml 1063 BLAKE2B 17fdb23d44430d8a8f87218b2c6d75a617487a6f204e2b77dd4139c972626ad503a8379e1455f55a644db6219779dc37501d66e75a3f8e90bdf89d095223c449 SHA512 05f28554ebddf8e7e6f8911a39ca744ae13e4802a90b24f2edd438aaa591c0f73d39fb186da546cb4834c312c66dc5e7f96f9cf36216d8d7d0b910ae7e422323
+EBUILD containerd-1.3.7.ebuild 1974 BLAKE2B 40e9d21e8bfc04de4931748ce962897a62353faaaf400b1f66ac625b24cd1f0aa8ed74ed808b3c5e97ebc0f4649126f9b9d806974a1103772f91537e89ec03f5 SHA512 6fe127a926c668b3c47ab90b82f56335125084dacfc75bc75a7af3d63adb8b7ade4fa5baaf437a80ef55f3383834e25d320106ca02ca3af106fbfdf92c54e8fe
+MISC metadata.xml 1175 BLAKE2B ee2c3165391688c6e20b0ecb35ccb59a5b621624b0dbfe72d8311ea3d0c1fc17894870f4be00282c9e50c7f931889b8d5f9667fd925eba98756f7b4fbf98cd20 SHA512 68dcef07630bd32f06360c0afd5742a7e3ad75645cfa77ef56a6d0236634ed0c8e69b517c53114d95fab5dbc6cae37f306d3328289b1e562a0a335a36596d19e
diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild b/app-emulation/containerd/containerd-1.2.10.ebuild
deleted file mode 100644
index 5a1d397114b4..000000000000
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="b34a5c8af56e510852c35414db4c1f4fa6172339"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc8
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild
deleted file mode 100644
index 5e5bc5aef5e8..000000000000
--- a/app-emulation/containerd/containerd-1.2.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc8
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.2.13.ebuild b/app-emulation/containerd/containerd-1.2.13.ebuild
deleted file mode 100644
index e9635351fbd7..000000000000
--- a/app-emulation/containerd/containerd-1.2.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc8
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild
deleted file mode 100644
index 48bf1f799cf1..000000000000
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="894b81a4b802e4eb2a91d1ce216b8817763c29fb"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc6
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild b/app-emulation/containerd/containerd-1.2.7.ebuild
deleted file mode 100644
index 1cba833a7419..000000000000
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="85f6aa58b8a3170aec9824568f7a31832878b603"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc8
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild b/app-emulation/containerd/containerd-1.3.0.ebuild
deleted file mode 100644
index 0c41a6c57dd0..000000000000
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="36cf5b690dcc00ff0f34ff7799209050c3d0c59a"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc8
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild b/app-emulation/containerd/containerd-1.3.1.ebuild
deleted file mode 100644
index 97f5996a48aa..000000000000
--- a/app-emulation/containerd/containerd-1.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="c7a4f87"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc9
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild b/app-emulation/containerd/containerd-1.3.2.ebuild
deleted file mode 100644
index b280fe999e58..000000000000
--- a/app-emulation/containerd/containerd-1.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/containerd/${PN}"
-inherit toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT=ff48f57f
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc9
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="strip test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.3.4.ebuild b/app-emulation/containerd/containerd-1.3.4.ebuild
deleted file mode 100644
index 4733a84998c6..000000000000
--- a/app-emulation/containerd/containerd-1.3.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/containerd/${PN}"
-inherit toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_rc/-rc.}"
- EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT=814b7956
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc9
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="strip test"
-
-src_prepare() {
- default
- if [[ ${PV} != *9999* ]]; then
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
- -e "s/-s -w//" \
- Makefile || die
- fi
-}
-
-src_compile() {
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- keepdir /var/lib/containerd
- dobin bin/*
-}
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
index 9a7b8db286a6..b6ed4b2e74c2 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
DEPEND="
@@ -73,7 +73,7 @@ src_compile() {
src_install() {
dobin bin/*
doman man/*
- newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+ newinitd "${FILESDIR}"/${PN}.initd "${PN}"
keepdir /var/lib/containerd
# we already installed manpages, remove markdown source
diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd
index bedf000cad5b..6536fc9ef209 100644
--- a/app-emulation/containerd/files/containerd.initd
+++ b/app-emulation/containerd/files/containerd.initd
@@ -1,14 +1,16 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Containerd container runtime"
command="/usr/bin/containerd"
+command_args="${command_args:-}"
+command_background="true"
pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
-start_stop_daemon_args="--background --make-pidfile --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+start_stop_daemon_args="--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
start_pre() {
- checkpath -m 0750 -d /var/log/${RC_SVCNAME}
+ checkpath -m 0750 -d "/var/log/${RC_SVCNAME}"
ulimit -n 1048576
diff --git a/app-emulation/containerd/files/containerd.initd-r1 b/app-emulation/containerd/files/containerd.initd-r1
deleted file mode 100644
index 6536fc9ef209..000000000000
--- a/app-emulation/containerd/files/containerd.initd-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Containerd container runtime"
-command="/usr/bin/containerd"
-command_args="${command_args:-}"
-command_background="true"
-pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
-start_stop_daemon_args="--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-start_pre() {
- checkpath -m 0750 -d "/var/log/${RC_SVCNAME}"
-
- ulimit -n 1048576
-
- # Having non-zero limits causes performance problems due to accounting overhead
- # in the kernel. We recommend using cgroups to do container-local accounting.
- ulimit -u unlimited
-
- return 0
-}
-
-start_post() {
- ewaitfile 5 /run/containerd/containerd.sock
-}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index 534d7d6a1880..46b01647099c 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -16,6 +16,10 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
<use>
<flag name="apparmor">Support for AppArmor</flag>
<flag name="btrfs">Support for BTRFS snapshot driver</flag>