1 files changed, 10 insertions, 11 deletions

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 48f7d3ec..05a14f97 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -36,17 +36,21 @@ GO_IMPORT = "import"
 S = "${WORKDIR}/git"
 
 
+
 inherit systemd update-rc.d
 inherit go
 inherit goarch
 inherit pkgconfig
 
+REQUIRED_DISTRO_FEATURES ?= "seccomp ipv6"
+inherit features_check
+
 do_configure[noexec] = "1"
 
 # Export for possible use in Makefiles, default value comes from go.bbclass
 export GO_LINKSHARED
 
-DOCKER_PKG="github.com/docker/docker"
+DOCKER_PKG = "github.com/docker/docker"
 # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056
 BUILD_TAGS ?= "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper"
 
@@ -60,8 +64,7 @@ do_compile() {
         ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
         
         mkdir -p .gopath/src/github.com/docker
-        ln -sf ${WORKDIR}/git/libnetwork .gopath/src/github.com/docker/libnetwork
-        ln -sf ${WORKDIR}/git/cli .gopath/src/github.com/docker/cli
+        ln -sf ${S}/cli .gopath/src/github.com/docker/cli
 
         export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor"
         export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
@@ -90,17 +93,13 @@ do_compile() {
         export LDFLAGS=""
         export DOCKER_VERSION=${DOCKER_VERSION}
         VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary
-
-        # build the proxy
-        cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork
-        oe_runmake cross-local
 }
 
 do_install() {
         mkdir -p ${D}/${bindir}
-        cp ${WORKDIR}/git/cli/build/docker ${D}/${bindir}/docker
+        cp ${S}/cli/build/docker ${D}/${bindir}/docker
         cp ${S}/src/import/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
-        cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
+        cp ${S}/src/import/bundles/dynbinary-daemon/docker-proxy ${D}/${bindir}/docker-proxy
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
                 install -d ${D}${systemd_unitdir}/system
@@ -110,7 +109,7 @@ do_install() {
                 rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
         else
                 install -d ${D}${sysconfdir}/init.d
-                install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
+                install -m 0755 ${UNPACKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
         fi
         # TLS key that docker creates at run-time if not found is what resides here
         if ${@bb.utils.contains('PACKAGECONFIG','transient-config','true','false',d)}; then
@@ -126,7 +125,7 @@ do_install() {
 
 
 SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.socket','',d)}"
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service docker.socket','',d)}"
 SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 # inverted logic warning. We ony want the sysvinit init to be installed if systemd