From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- app-emulation/containerd/Manifest | 2 + .../containerd/containerd-1.2.0-r1.ebuild | 56 ++++++++++++++++++++++ app-emulation/containerd/files/containerd.initd | 18 +++++++ 3 files changed, 76 insertions(+) create mode 100644 app-emulation/containerd/containerd-1.2.0-r1.ebuild create mode 100644 app-emulation/containerd/files/containerd.initd (limited to 'app-emulation/containerd') diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 9d1392809f98..82063142a2f8 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,4 +1,5 @@ AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2B ac48bd7835011bd3cad719bf2d0bdf6457bb6271989e1e7159ea5c3049e332cea6f5649f39d89820c724a03d50044ea3177fd48b23f5ea67f8518b9f011bd0c5 SHA512 7e6f499eb27372a068909c823884a788f7bab7f0852ec2b67c2a2d475f9dae15dedad130d548b6986978c3b85a4c5e2ba12ee37e529d18461be82546d5e2a638 +AUX containerd.initd 609 BLAKE2B 8a8c20d037c2695855a673266e98dd8ba19893656e1e7a4525c7097da022cc1f294085551cb51bc4a9672b3e37b56000578ab7a3aab8fabc23643a85d288f340 SHA512 ae1745ea7c656ce66e64e5c0efb8c334351e5410e74d777a70a5cf1dbe249f7b5d9b79147b44b9361dc6ccf21f89d48cf8f29ca0a95c006ca29b274a00643336 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c @@ -8,6 +9,7 @@ EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff9658 EBUILD containerd-1.1.1.ebuild 1296 BLAKE2B 19ac8685f774a4ccafbe0433a11b15a2b31c270af9b199a6f543789f93403f1715ac021d24f68e2a7278fab25065900ba02c3efca92e18aa44589d54667d6571 SHA512 f37c5cacabd3f6713af25a9343cb532ba6f73ec842d5d7cbe600bed510a4e11e3c7b27541666af6542dda2be658129c144929c4d2e7a0d8824e308983b4a0a66 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.0-r1.ebuild 1470 BLAKE2B 08fc579fcb7ce245aa6f2b855fb690100efbe2f5f7ee6745daa80e8661cbeb96593d83c4a00945a5a5981042908b23ca47de0b7a1a0b939e73f7da84ddbb67a6 SHA512 1a0c08342c1737710be44c24630a39b67c41d5592f3cf7d5f08a3e237acd4000bc603cc8675b1f89349a7bcd1fbb9fd9777eecf82402ea1c86e5137cdcb10a76 EBUILD containerd-1.2.0.ebuild 1447 BLAKE2B 51c626c9a8255accf1aaffa70db0e5eda300a042f5cd500a82d8dc025e10d845bfd43de7c449297edc93173fa770c42596c53456dce06c1a9b63fc39c48f57a8 SHA512 327bc4d0276821ad4f535f39a3ff3f056ccfef84ffeafbc5fb329ea2c82f2ed3abf072029358d42892c21caf378ed52b8340307356205cf27d8a83aca0a5e6ef 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.0-r1.ebuild b/app-emulation/containerd/containerd-1.2.0-r1.ebuild new file mode 100644 index 000000000000..27e3a7531553 --- /dev/null +++ b/app-emulation/containerd/containerd-1.2.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 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="c4446665cb9c30056f4998ed953e6d4ff22c7c39" + 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} + dodir /var/lib/containerd + dobin bin/containerd{-shim,-stress,} bin/ctr +} diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd new file mode 100644 index 000000000000..3a02d494ad15 --- /dev/null +++ b/app-emulation/containerd/files/containerd.initd @@ -0,0 +1,18 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 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_pre() { + 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 +} -- cgit v1.2.3