summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-05-01 10:27:45 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-05-03 22:21:25 -0400
commita3617f24641962e6732c8369ce9256ae4be5a2a0 (patch)
tree6458b580519d28f81f298852fa7280340e0ce874 /recipes-containers/docker
parent1fd94d853545b55173b1f0e2cf683a5d21f8cd7b (diff)
downloadmeta-virtualization-a3617f24641962e6732c8369ce9256ae4be5a2a0.tar.gz
globally replace 'base_contains' calls with 'bb.utils.contains'
The 'base_contains' is now deprecated and only kept as a compatibility method. It will be removed in future releases. Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker')
-rw-r--r--recipes-containers/docker/docker_git.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index f232d3d8..81af82d0 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -100,18 +100,18 @@ do_compile() {
100 100
101inherit systemd update-rc.d 101inherit systemd update-rc.d
102 102
103SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" 103SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
104SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','docker.service','',d)}" 104SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"
105 105
106INITSCRIPT_PACKAGES += "${@base_contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" 106INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
107INITSCRIPT_NAME_${PN} = "${@base_contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" 107INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
108INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" 108INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
109 109
110do_install() { 110do_install() {
111 mkdir -p ${D}/${bindir} 111 mkdir -p ${D}/${bindir}
112 cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker 112 cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker
113 113
114 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 114 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
115 install -d ${D}${systemd_unitdir}/system 115 install -d ${D}${systemd_unitdir}/system
116 install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system 116 install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
117 # replaces one copied from above with one that uses the local registry for a mirror 117 # replaces one copied from above with one that uses the local registry for a mirror