From 89fd0376fac23703c97564d4e73d8e8ab4833117 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Jan 2018 11:44:33 -0500 Subject: [PATCH] app-emulation/containerd: Bump to 1.0.0 for Docker 17.12 --- .../app-emulation/containerd/Manifest | 2 +- ...ta2_p53.ebuild => containerd-1.0.0.ebuild} | 0 .../containerd/containerd-9999.ebuild | 20 +++++++------------ .../app-emulation/containerd/metadata.xml | 3 +++ 4 files changed, 11 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.0.0_beta2_p53.ebuild => containerd-1.0.0.ebuild} (100%) 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 63de4d6c97..a016d9be10 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,4 +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-0.2.9_p27.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0 -DIST containerd-1.0.0_beta2_p53.tar.gz 3682585 SHA256 2c3ffd4306fbb7dc843832e7d4876bc9400ea4bb52d4bb3d86fc61f223ee114d SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9 WHIRLPOOL 11006ce534180ab80c337df08de6ecd58bfea2829e0b5ba5c32531214033dd767bd897e982066c43d4d024705040b998f258fa7facda5bbbbedd5a1f009ed13b +DIST containerd-1.0.0.tar.gz 3763785 SHA256 874720e68140cf57c7a4997cdab0b8177ad2ddb89e6332bb4f0ba23699a321fd SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a WHIRLPOOL 73ec169ed5529bbc7963e859f1a19497fd45d80352be94fef678a51066689c877a82bc97179aa53cc75bb363d251c3d09e5ce43a693522f08cc19b11bf9b7db1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0_beta2_p53.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0_beta2_p53.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild 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 3f7b051470..dfdce460f7 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,15 +11,11 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" inherit git-r3 else - # Update the patch number when setting commit. - # The patch number is arbitrarily chosen as the number of commits since the - # tagged version. - # e.g. git log --oneline v1.0.0-beta.2..${EGIT_COMMIT} | wc -l - EGIT_COMMIT="992280e8e265f491f7a624ab82f3e238be086e49" + EGIT_COMMIT="89623f28b87a6004d4b785663257362d1658a729" # v1.0.0 SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot - MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v1.0.0-beta.2-53-g992280e8" + MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v${PV}" fi inherit coreos-go systemd @@ -32,27 +28,25 @@ SLOT="0" IUSE="hardened +seccomp" DEPEND="" -RDEPEND=">=app-emulation/docker-runc-1.0.0_rc4 +RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p171 seccomp? ( sys-libs/libseccomp )" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} -RESTRICT="test" - src_unpack() { mkdir -p "${S}" tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" } src_compile() { - local options=( $(usex seccomp "seccomp" '') ) + local options=( $(usex seccomp "seccomp" "") ) export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake ${MAKE_VERSION_ARGS} BUILDTAGS="${options[@]}" } src_install() { - dobin bin/containerd* bin/ctr + 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" + doins "${FILESDIR}/config.toml" } diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/metadata.xml index 92b6d2585a..7cc4630534 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/metadata.xml @@ -20,6 +20,9 @@ williamh@gentoo.org William Hubbs + + Support for BTRFS snapshot driver + docker/containerd