diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-03-20 15:54:50 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-03-20 15:55:03 -0400 |
commit | a050e7a61dac3d8fc2f8f68e763002b4a4664d71 (patch) | |
tree | e164e6ec28b789bda3d47741437ad2efb973e270 /recipes-containers/docker | |
parent | b44fce825df56c0f26adb6ae1f647ae07f6096ee (diff) | |
download | meta-virtualization-a050e7a61dac3d8fc2f8f68e763002b4a4664d71.tar.gz |
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 <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker')
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
38 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" | 38 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" |
39 | 39 | ||
40 | DEPENDS = " \ | 40 | DEPENDS = " \ |
41 | go-cross-${TARGET_ARCH} \ | ||
42 | go-cli \ | 41 | go-cli \ |
43 | go-pty \ | 42 | go-pty \ |
44 | go-context \ | 43 | go-context \ |
@@ -61,7 +60,7 @@ DEPENDS = " \ | |||
61 | 60 | ||
62 | PACKAGES =+ "${PN}-contrib" | 61 | PACKAGES =+ "${PN}-contrib" |
63 | 62 | ||
64 | DEPENDS_append_class-target = "lvm2" | 63 | DEPENDS_append_class-target = " lvm2" |
65 | RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ | 64 | RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ |
66 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ | 65 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ |
67 | " | 66 | " |
@@ -132,6 +131,7 @@ do_compile() { | |||
132 | } | 131 | } |
133 | 132 | ||
134 | inherit systemd update-rc.d | 133 | inherit systemd update-rc.d |
134 | inherit go | ||
135 | 135 | ||
136 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 136 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
137 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" | 137 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" |