docker: use oe-core go infrastructure

The docker recipe has some outdated go hacks. While this doesn't remove
them all, it does use more of the oe-core go infrastructure .. and that
results in more consistent builds.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2017-03-22 17:19:59 -04:00
parent 7c73258abc
commit 7bf6863a5a

View File

@ -70,33 +70,13 @@ RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat"
RSUGGESTS_${PN} = "lxc rt-tests"
DOCKER_PKG="github.com/docker/docker"
inherit systemd update-rc.d
inherit go
inherit go-osarchmap
do_configure[noexec] = "1"
do_compile() {
case "${TARGET_ARCH}" in
arm)
GOARCH=arm
case "${TUNE_PKGARCH}" in
cortexa*)
export GOARM=7
;;
esac
;;
aarch64)
GOARCH=arm64
;;
i586|i686)
GOARCH=386
;;
x86_64)
GOARCH=amd64
;;
*)
GOARCH="${TARGET_ARCH}"
;;
esac
export GOARCH
# Set GOPATH. See 'PACKAGERS.md'. Don't rely on
# docker to download its dependencies but rather
# use dependencies packaged independently.
@ -130,9 +110,6 @@ do_compile() {
go build -o ${S}/docker-proxy github.com/docker/libnetwork/cmd/proxy
}
inherit systemd update-rc.d
inherit go
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"