commit: 662b77d032d55476c2f08a9f7d413f8fc4bedaaf Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Mon Nov 14 18:08:07 2016 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Mon Nov 14 18:08:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662b77d0
app-emulation/docker: sync live ebuild Package-Manager: portage-2.3.0 app-emulation/docker/docker-9999.ebuild | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index feccb2c..f7e5a33 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.ebuild @@ -26,9 +26,9 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker HOMEPAGE="https://dockerproject.org"; LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp" +IUSE="apparmor aufs btrfs +device-mapper hardened overlay pkcs11 seccomp" -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies CDEPEND=" >=dev-db/sqlite-3.7.9:3 device-mapper? ( @@ -44,12 +44,12 @@ DEPEND=" dev-go/go-md2man btrfs? ( - >=sys-fs/btrfs-progs-3.8 + >=sys-fs/btrfs-progs-3.16.1 ) " -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies RDEPEND=" ${CDEPEND} @@ -61,6 +61,7 @@ RDEPEND=" >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?] + app-emulation/docker-proxy " RESTRICT="installsources strip" @@ -111,7 +112,7 @@ pkg_setup() { if kernel_is lt 3 10; then ewarn "" ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"; + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"; fi # for where these kernel versions come from, see: @@ -199,10 +200,10 @@ src_compile() { export CGO_CFLAGS="-I${ROOT}/usr/include" export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - # if we're building from a zip, we need the GITCOMMIT value + # if we're building from a tarball, we need the GITCOMMIT value [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - if gcc-specs-pie; then + if use hardened; then sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' @@ -222,19 +223,12 @@ src_compile() { fi done - for tag in apparmor seccomp; do + for tag in apparmor pkcs11 seccomp; do if use $tag; then DOCKER_BUILDTAGS+=" $tag" fi done - # https://github.com/docker/docker/pull/13338 - if use experimental; then - export DOCKER_EXPERIMENTAL=1 - else - unset DOCKER_EXPERIMENTAL - fi - # time to build! ./hack/make.sh dynbinary || die 'dynbinary failed' @@ -246,7 +240,6 @@ src_install() { VERSION="$(cat VERSION)" newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd - newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy dosym containerd /usr/bin/docker-containerd dosym containerd-shim /usr/bin/docker-containerd-shim dosym runc /usr/bin/docker-runc @@ -272,8 +265,8 @@ src_install() { doins -r contrib/syntax/vim/syntax # note: intentionally not using "doins" so that we preserve +x bits - mkdir -p "${D}/usr/share/${PN}/contrib" - cp -R contrib/* "${D}/usr/share/${PN}/contrib" + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" } pkg_postinst() {
