From f324f1c7c582cd265ffbc70129d206c24c936671 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 31 Jan 2017 22:42:47 -0800 Subject: [PATCH] Revert "Merge pull request #2403 from euank/1298-runc-userns" This reverts commit 7f3b121e061d4592729161026f18abe5444f22f0, reversing changes made to aaaef8fa392528e6b57135a960428e9ef8b0dfbc. I messed up and cherry-picked into master instead of the build-1298 branch and it worked because the file in question had since been renamed to rc4. This reverts that extraneous file. --- .../runc/runc-1.0.0_rc2-r3.ebuild | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild deleted file mode 100644 index 56b1affa84..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GITHUB_URI="github.com/opencontainers/runc" -COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.6" -# the commit of runc that docker uses. -# see https://github.com/docker/docker/blob/v1.12.6/Dockerfile#L245 -# Note: this commit is only really present in `docker/runc` in the 'docker/1.12.x' branch -COMMIT_ID="50a19c6ff828c58e5dab13830bd3dacde268afe5" - -inherit eutils flag-o-matic coreos-go-depend vcs-snapshot - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://runc.io" - -SRC_URI="https://${GITHUB_URI}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 arm64" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor selinux +seccomp" - -DEPEND="" -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) -" - -src_prepare() { - epatch "${FILESDIR}/0001-Makefile-do-not-install-dependencies-of-target.patch" - epatch "${FILESDIR}/0002-Dont-set-label-for-mqueue-under-userns.patch" - - # Work around https://github.com/golang/go/issues/14669 - # Remove after updating to go1.7 - filter-flags -O* - - go_export -} - -src_compile() { - # build up optional flags - local options=( - $(usev apparmor) - $(usev seccomp) - $(usev selinux) - ) - - emake BUILDTAGS="${options[*]}" -} - -src_install() { - dobin runc -}