From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F2F81382DE for ; Mon, 27 Jun 2016 22:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D89A1141E5; Mon, 27 Jun 2016 22:33:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 625C1141E5 for ; Mon, 27 Jun 2016 22:33:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90B9F340C72 for ; Mon, 27 Jun 2016 22:33:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 413A723BD for ; Mon, 27 Jun 2016 22:33:12 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1467066263.d9156b4a95e28ded66a9425a7d940e444060c2f5.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-9999.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d9156b4a95e28ded66a9425a7d940e444060c2f5 X-VCS-Branch: master Date: Mon, 27 Jun 2016 22:33:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 385777d3-2adc-4072-a176-77121d19e546 X-Archives-Hash: 96780c7a4457cdc7e495402d69546f4f commit: d9156b4a95e28ded66a9425a7d940e444060c2f5 Author: William Hubbs gentoo org> AuthorDate: Mon Jun 27 19:40:23 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Jun 27 22:24:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9156b4a app-emulation/docker: live ebuild updates based on upstream - use symlinks for docker-runc and docker-containerd instead of patching - add kernel checks for CONFIG_IP_VS, CONFIG_XFRM_ALGO and CONFIG_XFRM_USER Package-Manager: portage-2.2.28 app-emulation/docker/docker-9999.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index 0667345..408fee5 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.ebuild @@ -72,6 +72,7 @@ CONFIG_CHECK=" ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~IP_VS ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NF_NAT ~NF_NAT_NEEDED @@ -84,6 +85,7 @@ CONFIG_CHECK=" ~CGROUP_HUGETLB ~NET_CLS_CGROUP ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~XFRM_ALGO ~XFRM_USER " ERROR_KEYS="CONFIG_KEYS: is mandatory" @@ -95,6 +97,8 @@ ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gather ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" pkg_setup() { if kernel_is lt 3 10; then @@ -166,14 +170,6 @@ pkg_setup() { enewgroup docker } -src_prepare() { - cd "src/${EGO_PN}" || die - sed -i 's/docker-containerd/containerd/g; s/docker-runc/runc/g' libcontainerd/remote_linux.go - # allow user patches (use sparingly - upstream won't support them) - cd - - eapply_user -} - src_compile() { cd "src/${EGO_PN}" || die export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" @@ -228,6 +224,8 @@ src_install() { VERSION="$(cat VERSION)" newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd + dosym containerd /usr/bin/docker-containerd + dosym runc /usr/bin/docker-runc newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker