commit: b8f6aff9acb4cbc32d79486ecdff09e4adf5d5f4
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 12:01:18 2019 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 12:01:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f6aff9
app-emulation/containerd: Remove old
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>
app-emulation/containerd/Manifest | 3 --
app-emulation/containerd/containerd-1.1.1.ebuild | 54 ---------------------
.../containerd/containerd-1.2.0-r1.ebuild | 56 ----------------------
app-emulation/containerd/containerd-1.2.0.ebuild | 55 ---------------------
app-emulation/containerd/containerd-1.2.1.ebuild | 56 ----------------------
...p20180223-remove-c-constant-redefinitions.patch | 38 ---------------
6 files changed, 262 deletions(-)
diff --git a/app-emulation/containerd/Manifest
b/app-emulation/containerd/Manifest
index 62e4ec779c2..1aba2d6949e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,5 @@
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
DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B
cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0
SHA512
c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
-DIST containerd-1.2.0.tar.gz 4605096 BLAKE2B
5bcfb252933d4f8d5ab6c7e91505cfec34137545121440cd6935e05cd3c62a4969fff8b90b628634c01cc9a4dc3901c307604ab30f45a03dd20112653da9437d
SHA512
f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd
-DIST containerd-1.2.1.tar.gz 4605947 BLAKE2B
340daac847eaa653d15894fd65c190702807400dfb8293b5a2507b9a13a86752c00357cf6aeb3735c57878c34f79c35076d7087a905ee7efe7971746c792a212
SHA512
0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5
DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B
aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89
SHA512
0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B
9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897
SHA512
01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild
b/app-emulation/containerd/containerd-1.1.1.ebuild
deleted file mode 100644
index 0dc6845f4ea..00000000000
--- a/app-emulation/containerd/containerd-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="d64c661f1d51c48782c9cec8fda7604785f93587"
- 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="+btrfs hardened"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
- >=app-emulation/runc-1.0.0_rc4 )
- 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") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake
BUILDTAGS="${options[@]}"
-}
-
-src_install() {
- dobin bin/containerd{-shim,-stress,} bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-1.2.0-r1.ebuild
b/app-emulation/containerd/containerd-1.2.0-r1.ebuild
deleted file mode 100644
index 27e3a753155..00000000000
--- a/app-emulation/containerd/containerd-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/containerd-1.2.0.ebuild
b/app-emulation/containerd/containerd-1.2.0.ebuild
deleted file mode 100644
index d7d5430a826..00000000000
--- a/app-emulation/containerd/containerd-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/docker-runc-1.0.0_rc4
- >=app-emulation/runc-1.0.0_rc4 )
- 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() {
- dobin bin/containerd{-shim,-stress,} bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-1.2.1.ebuild
b/app-emulation/containerd/containerd-1.2.1.ebuild
deleted file mode 100644
index c9791d3160d..00000000000
--- a/app-emulation/containerd/containerd-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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="9b32062dc1f5a7c2564315c269b5059754f12b9d"
- 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-1.0.3_p20180223-remove-c-constant-redefinitions.patch
b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
deleted file mode 100644
index f08fab6e592..00000000000
---
a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001
-From: Stephen J Day <[email protected]>
-Date: Fri, 2 Mar 2018 13:23:31 -0800
-Subject: [PATCH] btrfs: remove C constant redefinitions
-
-Signed-off-by: Stephen J Day <[email protected]>
----
- btrfs.go | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/vendor/github.com/containerd/btrfs/btrfs.go
b/vendor/github.com/containerd/btrfs/btrfs.go
-index 1deab47..efdf528 100644
---- a/vendor/github.com/containerd/btrfs/btrfs.go
-+++ b/vendor/github.com/containerd/btrfs/btrfs.go
-@@ -7,10 +7,6 @@ import "sort"
- #include <btrfs/ioctl.h>
- #include "btrfs.h"
-
--// Required because Go has struct casting rules for negative numbers
--const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID;
--const __u64 negative_one = (__u64)-1;
--
- static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2*
btrfs_struct) {
- return btrfs_struct->name;
- }
-@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) {
- args.key.min_type = C.BTRFS_ROOT_ITEM_KEY
- args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY
- args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID
-- args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID
-- args.key.max_offset = C.negative_one
-- args.key.max_transid = C.negative_one
-+ args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID
-+ args.key.max_offset = ^C.__u64(0)
-+ args.key.max_transid = ^C.__u64(0)
-
- subvolsByID := make(map[uint64]*Info)
-
