commit: bff574337518003f1f7bfcbb98e92373f0580a58 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Tue Nov 10 21:25:33 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue Nov 10 21:33:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff57433
app-emulation/containerd: drop old Bug: https://bugs.gentoo.org/749579 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> app-emulation/containerd/Manifest | 9 ---- app-emulation/containerd/containerd-1.2.10.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.2.12.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.2.13.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.2.6.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.2.7.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.3.0.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.3.1.ebuild | 56 ----------------------- app-emulation/containerd/containerd-1.3.2.ebuild | 55 ---------------------- app-emulation/containerd/containerd-1.3.4.ebuild | 55 ---------------------- app-emulation/containerd/files/containerd.initd | 24 ---------- 11 files changed, 535 deletions(-) diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index c00825bee4e..0f5c4312268 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,10 +1 @@ -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 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee 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 5a1d397114b..00000000000 --- 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 5e5bc5aef5e..00000000000 --- 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 e9635351fbd..00000000000 --- 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 48bf1f799cf..00000000000 --- 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 1cba833a741..00000000000 --- 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 0c41a6c57dd..00000000000 --- 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 97f5996a48a..00000000000 --- 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 b280fe999e5..00000000000 --- 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 4733a84998c..00000000000 --- 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/files/containerd.initd b/app-emulation/containerd/files/containerd.initd deleted file mode 100644 index bedf000cad5..00000000000 --- a/app-emulation/containerd/files/containerd.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Containerd container runtime" -command="/usr/bin/containerd" -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_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 -}
