diff options
| author |   William Hubbs <williamh@gentoo.org> | 2016-06-27 14:40:23 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2016-06-27 17:24:23 -0500 |
| commit | d9156b4a95e28ded66a9425a7d940e444060c2f5 (patch) | |
| tree | 5ef23b9e463e79aeb1039a2b6159f4519174d715 /app-emulation | |
| parent | dev-vcs/cvs: drop old 1.12.x ebuilds (diff) | |
| download | gentoo-d9156b4a95e28ded66a9425a7d940e444060c2f5.tar.gz gentoo-d9156b4a95e28ded66a9425a7d940e444060c2f5.tar.bz2 gentoo-d9156b4a95e28ded66a9425a7d940e444060c2f5.zip | |
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
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/docker/docker-9999.ebuild | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index 0667345ad26a..408fee5ecfd4 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 |