From 55284ff3c4d8d4adcda23be6e7cfa5284d21d466 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 23 Mar 2018 07:56:16 -0400 Subject: [PATCH] app-emulation/containerd: Add 1.0.2 for Docker 18.03.0 --- .../app-emulation/containerd/Manifest | 1 + .../containerd/containerd-1.0.1.ebuild | 64 ++++++++++++++++++- .../containerd/containerd-1.0.2.ebuild | 1 + .../containerd/containerd-9999.ebuild | 4 +- 4 files changed, 67 insertions(+), 3 deletions(-) mode change 120000 => 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild create mode 120000 sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest index d921fa830b..7b253dc535 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest @@ -1,3 +1,4 @@ DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4 DIST containerd-0.2.6.tar.gz 1020572 SHA256 a67c4153ac5ae26b9d11daac133b90cba059ba16de7579e39c3e82bcda856493 SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 WHIRLPOOL 98f64c888ea580074e51b91311ab186291cb2d3ecc9f178d828687dbb60b35104237041699b6125cf026edd245459a052fda1801ac3cd7e1efe34606c3d9a4eb DIST containerd-1.0.1.tar.gz 3766659 SHA256 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 WHIRLPOOL 29823ab7fed5ec3832644faa77256c5dfdb0ce61496f20848bb4aca1d25f25b318df5539dbad2794497fa27c9100cd85f088419674f2a8a28f937efc4cdab6ef +DIST containerd-1.0.2.tar.gz 3772144 SHA256 a31a12846a7a2f697f8fdd82cedd1626fc5f6345e59ae880664196c73e4c2226 SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a WHIRLPOOL ef2b648409f48ae72f9cc0dab3f8e1b5fdc31432fa0acc8e0b691adcc6ee9cfda520c6dc142e8d23efeb1989afd3be13ac9ec012788db3320bcf717d3527a902 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild deleted file mode 120000 index c5606b90ce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild +++ /dev/null @@ -1 +0,0 @@ -containerd-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild new file mode 100644 index 0000000000..b96de6f44f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GITHUB_URI="github.com/containerd/containerd" +COREOS_GO_PACKAGE="${GITHUB_URI}" +COREOS_GO_VERSION="go1.9" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://${GITHUB_URI}.git" + inherit git-r3 +else + MY_PV="${PV/_rc/-rc.}" + EGIT_COMMIT="v${MY_PV}" + CONTAINERD_COMMIT="9b55aab90508bd389d7654c4baf173a981477d55" + SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm64" + inherit vcs-snapshot +fi + +inherit coreos-go systemd + +DESCRIPTION="A daemon to control runC" +HOMEPAGE="https://containerd.tools" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+btrfs hardened" + +DEPEND="btrfs? ( sys-fs/btrfs-progs )" +RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p205 + sys-libs/libseccomp" + +S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} + +src_unpack() { + mkdir -p "${S}" + tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" +} + +src_prepare() { + coreos-go_src_prepare + 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") ) + export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor + LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[*]}" +} + +src_install() { + dobin bin/containerd{-shim,-stress,} bin/ctr + systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service" + insinto /usr/share/containerd + doins "${FILESDIR}/config.toml" +} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.2.ebuild new file mode 120000 index 0000000000..c5606b90ce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.2.ebuild @@ -0,0 +1 @@ +containerd-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index b96de6f44f..96865a1dc3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_rc/-rc.}" EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="9b55aab90508bd389d7654c4baf173a981477d55" + CONTAINERD_COMMIT="cfd04396dc68220d1cecbe686a6cc3aa5ce3667c" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot @@ -29,7 +29,7 @@ SLOT="0" IUSE="+btrfs hardened" DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p205 +RDEPEND="=app-emulation/docker-runc-1.0.0_rc5 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}