From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- app-emulation/containerd/Manifest | 10 ++--- app-emulation/containerd/containerd-1.2.2.ebuild | 56 ------------------------ app-emulation/containerd/containerd-1.2.3.ebuild | 56 ------------------------ app-emulation/containerd/containerd-1.2.4.ebuild | 56 ------------------------ app-emulation/containerd/containerd-1.2.5.ebuild | 56 ++++++++++++++++++++++++ app-emulation/containerd/files/containerd.initd | 10 ++++- 6 files changed, 67 insertions(+), 177 deletions(-) delete mode 100644 app-emulation/containerd/containerd-1.2.2.ebuild delete mode 100644 app-emulation/containerd/containerd-1.2.3.ebuild delete mode 100644 app-emulation/containerd/containerd-1.2.4.ebuild create mode 100644 app-emulation/containerd/containerd-1.2.5.ebuild (limited to 'app-emulation/containerd') diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 29fa0603106e..0e76cc928e2e 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,13 +1,9 @@ -AUX containerd.initd 609 BLAKE2B 8a8c20d037c2695855a673266e98dd8ba19893656e1e7a4525c7097da022cc1f294085551cb51bc4a9672b3e37b56000578ab7a3aab8fabc23643a85d288f340 SHA512 ae1745ea7c656ce66e64e5c0efb8c334351e5410e74d777a70a5cf1dbe249f7b5d9b79147b44b9361dc6ccf21f89d48cf8f29ca0a95c006ca29b274a00643336 +AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf8d7420dde704174f237a9023a9546cfcb2a122bb74ef583119c9668b453f11612eed26aca55044132 SHA512 d0193e784c62070004e43a7d8b8834bbcd2eba51faa7f8505cea04e06740f5e4950e5c036aa32edf3f592c02f3dd9e65214a6adba8579bdf9c79ae556af94462 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8 -DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff -DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d -DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43 SHA512 8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80 +DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0 SHA512 b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25 EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3 EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b840104c573373cfd7d964f0c6f8876771930225c2fb58ecd17e98854cb050ce91eef66e83201d0d6522b4250d21bb SHA512 be79eade0670b9701670953c552d4452e583284acf3f721d22992ada3f2e55745fa85cab1ea102b5d68d709320f1f44207b43c5ba473ef8e2951ea0ac07c802a -EBUILD containerd-1.2.2.ebuild 1471 BLAKE2B ad5699507bac5219eea6d682a2db3525eff1ba6a93125c3cc270d0c9fbe34adba1f7492502601f4f72c7933d6814c2e4a77e003bc8fd758df1bce792fd32f5d2 SHA512 e1a2de6e4f4375935234bcc21fe92586feb3d2855563fe52191462a009cf2e83a745cb32512f127ba7781713b6d17f2036a82dfc776cf9e4c9f060a80dfeeb04 -EBUILD containerd-1.2.3.ebuild 1439 BLAKE2B 291f8949af5f47e1b22c568bdc37f6c425db53ab9d6b65d31492a81145d02cb68eb6405d2d0596c3adbc938d1a86a0f41c1798851484aa02fd3f093a1bc0f8df SHA512 cfb556243ad6a477af83750a91013a0b1aed20eece4914a4a853de66201003b89e759e4bf1025dc433cabb3f0461e69c335520234ec254a6fac8cfd8f21da432 -EBUILD containerd-1.2.4.ebuild 1439 BLAKE2B b8b08284f3c7334fe2837d81f1496f0d4e6f84d2ddc1fb4af59b033a94720218bc5b34aac44c0dfe0af9d5501f5c204fc2c5d17dd4c932ed7f0dda302449fb9b SHA512 bb052f147d6eb22576e3b104d079d4bb1823c21fcbf3cecfc0eb78efff2b1518be88db475e34c783039ddc991728487fb83b3f03a906079a8dd6071bab4327bd +EBUILD containerd-1.2.5.ebuild 1438 BLAKE2B 3b7c9da1e9aa7ec24702cc06e9c1afd187d009ed17f3a43bc46c89db9bd48650041beaff9f3ac609c8cae1ffd0cab8179f98e6f6366d6545e275405dd0982d25 SHA512 7e79fd290f74fc80663e6c9da11b09e0b96eb3c424744e9399cd47f1b42e3015da2822c75721b1224da3109a257f9286e221bb0345940ca8dccf1d259120eb71 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3 diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild b/app-emulation/containerd/containerd-1.2.2.ebuild deleted file mode 100644 index 0cdf19490c85..000000000000 --- a/app-emulation/containerd/containerd-1.2.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 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="9754871865f7fe2f4e74d43e2fc7ccd237edcbce" - 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.tools" - -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_rc5 - 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/containerd{-shim,-stress,} bin/ctr -} diff --git a/app-emulation/containerd/containerd-1.2.3.ebuild b/app-emulation/containerd/containerd-1.2.3.ebuild deleted file mode 100644 index e548ba8fb086..000000000000 --- a/app-emulation/containerd/containerd-1.2.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 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="7f5f1176dd9fb3cc8d3ce5de91759ed3dc969fa2" - 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.tools" - -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_rc5 - 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.4.ebuild b/app-emulation/containerd/containerd-1.2.4.ebuild deleted file mode 100644 index d34eeabe0995..000000000000 --- a/app-emulation/containerd/containerd-1.2.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 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="e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e" - 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.tools" - -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_rc5 - 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.5.ebuild b/app-emulation/containerd/containerd-1.2.5.ebuild new file mode 100644 index 000000000000..4df44a02efb8 --- /dev/null +++ b/app-emulation/containerd/containerd-1.2.5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 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="bb71b10fd8f58240ca47fbb579b9d1028eea7c84" + 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.tools" + +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_rc5 + 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/files/containerd.initd b/app-emulation/containerd/files/containerd.initd index 3a02d494ad15..bedf000cad5b 100644 --- a/app-emulation/containerd/files/containerd.initd +++ b/app-emulation/containerd/files/containerd.initd @@ -1,13 +1,15 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# 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 --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" +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 @@ -16,3 +18,7 @@ start_pre() { return 0 } + +start_post() { + ewaitfile 5 /run/containerd/containerd.sock +} -- cgit v1.2.3