From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-emulation/containerd/Manifest | 14 ------ app-emulation/containerd/containerd-1.0.1.ebuild | 52 ------------------- app-emulation/containerd/containerd-1.0.3.ebuild | 52 ------------------- .../containerd-1.0.3_p20180223-r1.ebuild | 58 ---------------------- .../containerd/containerd-1.0.3_p20180223.ebuild | 54 -------------------- app-emulation/containerd/containerd-1.1.0.ebuild | 54 -------------------- app-emulation/containerd/containerd-1.1.1.ebuild | 54 -------------------- app-emulation/containerd/containerd-9999.ebuild | 40 --------------- ...p20180223-remove-c-constant-redefinitions.patch | 38 -------------- app-emulation/containerd/metadata.xml | 29 ----------- 10 files changed, 445 deletions(-) delete mode 100644 app-emulation/containerd/Manifest delete mode 100644 app-emulation/containerd/containerd-1.0.1.ebuild delete mode 100644 app-emulation/containerd/containerd-1.0.3.ebuild delete mode 100644 app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild delete mode 100644 app-emulation/containerd/containerd-1.0.3_p20180223.ebuild delete mode 100644 app-emulation/containerd/containerd-1.1.0.ebuild delete mode 100644 app-emulation/containerd/containerd-1.1.1.ebuild delete mode 100644 app-emulation/containerd/containerd-9999.ebuild delete mode 100644 app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch delete mode 100644 app-emulation/containerd/metadata.xml (limited to 'app-emulation/containerd') diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest deleted file mode 100644 index 0bbe2c2ea4cc..000000000000 --- a/app-emulation/containerd/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2B ac48bd7835011bd3cad719bf2d0bdf6457bb6271989e1e7159ea5c3049e332cea6f5649f39d89820c724a03d50044ea3177fd48b23f5ea67f8518b9f011bd0c5 SHA512 7e6f499eb27372a068909c823884a788f7bab7f0852ec2b67c2a2d475f9dae15dedad130d548b6986978c3b85a4c5e2ba12ee37e529d18461be82546d5e2a638 -DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 -DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c -DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9 -DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42 -DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd -EBUILD containerd-1.0.1.ebuild 1238 BLAKE2B 58cebf0f2ec0958892599bbbe2f518e42cf6d98a91880c1393bbff38d51958b918ccd838d92e7a39bda493b1b4c52d1ecfa02ffb2dbb9ba46b165acf47abe1a7 SHA512 3e3013ed0bec752ddff0bc524cb6c003b8c41db036201f9212bff1a298abf4486c64b7d65e3fd1e9d972e53b2c18d1d87f5f9db12d28ef9bca7f4c4981b6ce3d -EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc -EBUILD containerd-1.0.3_p20180223-r1.ebuild 1375 BLAKE2B 13216281e1705042ca721693a9c77174243e83b2384ad4272d03f460688da50e55b45eeb4f7d23d5eac4c57b6434e5c7f2675ffb1eecf244f9fa4ceed7638244 SHA512 a9d25044e4aed1c35cc4cf5e51c825405ed2549a2e48decdb3ae30abf54ed43385e4049809bc5d1a8f7e3c966e1ed980ab325d339c6ad882dfac4ba05b86f9b9 -EBUILD containerd-1.0.3_p20180223.ebuild 1302 BLAKE2B b6d58ed568a7e402b1417c8fcfd9bb6d07ad57017859a50f178abc65b776eb6100c9067c8c7ce36a275368c0ceb84d72e81e0beada64a82d4caf88a01025dbeb SHA512 73f29cb43c6f819e859a758513fedd8ac67816ea6ef18435b34aafe1e1e564169927a2d7c54b0bde6816f64e3f840f0c75cb09b0742ccf17f46602e6a7e89c7a -EBUILD containerd-1.1.0.ebuild 1289 BLAKE2B af1f7b19a91f90ece5ffa24f9282d0b7ebda179590b949c30d3d172b0c7829fb3e4d0a615a6d3fa94d548cdb1735ec0e38c8bd28d040dec272b9bc51cfffa733 SHA512 823c1d1dbf754d94f6143a173b893f837ac643eeae9510105699af3725a2b5d529cb9c98e5d1afdaab7c456e72a4d10440b9ccedea9537c21069bfefec3a2094 -EBUILD containerd-1.1.1.ebuild 1289 BLAKE2B e5ace69d6c9a0cd9271ae86da50bd75a224c2cc6c5d04b5dfee43cee92f4fa3084337978a409408c4dc447ea86964e4ec22868bffaae547bbd0ea3dec6b4299f SHA512 9ea0297903f3317aff7de788300920b3a30a77c892c6942f2a2e99e22da8b3aad25af24db398f890e760c0c707eb1acad9caa8a158d140064a8c5fff6e2826e7 -EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 -MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147 diff --git a/app-emulation/containerd/containerd-1.0.1.ebuild b/app-emulation/containerd/containerd-1.0.1.ebuild deleted file mode 100644 index 4495f7028494..000000000000 --- a/app-emulation/containerd/containerd-1.0.1.ebuild +++ /dev/null @@ -1,52 +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="9b55aab" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~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} - -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.0.3.ebuild b/app-emulation/containerd/containerd-1.0.3.ebuild deleted file mode 100644 index 446548c25d77..000000000000 --- a/app-emulation/containerd/containerd-1.0.3.ebuild +++ /dev/null @@ -1,52 +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="773c489" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~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} - -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.0.3_p20180223-r1.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild deleted file mode 100644 index a37f908adc0d..000000000000 --- a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild +++ /dev/null @@ -1,58 +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="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac" - SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_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" - -PATCHES=( - "${FILESDIR}"/"${P}-remove-c-constant-redefinitions.patch" -) - -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.0.3_p20180223.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild deleted file mode 100644 index 3c7eee7d07d2..000000000000 --- a/app-emulation/containerd/containerd-1.0.3_p20180223.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="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac" - SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_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.1.0.ebuild b/app-emulation/containerd/containerd-1.1.0.ebuild deleted file mode 100644 index 1b01107dcac3..000000000000 --- a/app-emulation/containerd/containerd-1.1.0.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="209a7fc3e4a32ef71a8c7b50c68fc8398415badf" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~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.1.1.ebuild b/app-emulation/containerd/containerd-1.1.1.ebuild deleted file mode 100644 index d3c39d6cfab5..000000000000 --- 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 ~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-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild deleted file mode 100644 index 345b3fa9b966..000000000000 --- a/app-emulation/containerd/containerd-9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 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/_beta/-beta.}" - EGIT_COMMIT="v${MY_PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened +seccomp" - -DEPEND="" -RDEPEND=">=app-emulation/runc-1.0.0_rc4 - seccomp? ( sys-libs/libseccomp )" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -src_compile() { - local options=( $(usex seccomp "seccomp" "") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" -} - -src_install() { - 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 f08fab6e592d..000000000000 --- 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 -Date: Fri, 2 Mar 2018 13:23:31 -0800 -Subject: [PATCH] btrfs: remove C constant redefinitions - -Signed-off-by: Stephen J Day ---- - 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 - #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) - diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml deleted file mode 100644 index 7cc463053468..000000000000 --- a/app-emulation/containerd/metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Containerd is a daemon with an API and a command line client, to manage - containers on one machine. It uses runC to run containers according to - the OCI specification. Containerd has advanced features such as seccomp - and user namespace support as well as checkpoint and restore for cloning - and live migration of containers. - - - admwiggin@gmail.com - Tianon - - - mrueg@gentoo.org - Manuel Rüger - - - williamh@gentoo.org - William Hubbs - - - Support for BTRFS snapshot driver - - - docker/containerd - - -- cgit v1.2.3