From a050e7a61dac3d8fc2f8f68e763002b4a4664d71 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 20 Mar 2017 15:54:50 -0400 Subject: go: use inherit go versus explicit DEPENDS We can now use the oe-core go bbclass to get our DEPENDS correct for building these go packages. Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-containers/docker') diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 246fbfeb..68586c81 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb @@ -38,7 +38,6 @@ DOCKER_VERSION = "1.13.0" PV = "${DOCKER_VERSION}+git${SRCREV_docker}" DEPENDS = " \ - go-cross-${TARGET_ARCH} \ go-cli \ go-pty \ go-context \ @@ -61,7 +60,7 @@ DEPENDS = " \ PACKAGES =+ "${PN}-contrib" -DEPENDS_append_class-target = "lvm2" +DEPENDS_append_class-target = " lvm2" RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ " @@ -132,6 +131,7 @@ do_compile() { } 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)}" -- cgit v1.2.3-54-g00ecf