diff options
Diffstat (limited to 'recipes-containers/docker')
| -rw-r--r-- | recipes-containers/docker/docker_git.bb | 10 |
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 | ||
| 101 | inherit systemd update-rc.d | 101 | inherit systemd update-rc.d |
| 102 | 102 | ||
| 103 | SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 103 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
| 104 | SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','docker.service','',d)}" | 104 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" |
| 105 | 105 | ||
| 106 | INITSCRIPT_PACKAGES += "${@base_contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" | 106 | INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" |
| 107 | INITSCRIPT_NAME_${PN} = "${@base_contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" | 107 | INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" |
| 108 | INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 108 | INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
| 109 | 109 | ||
| 110 | do_install() { | 110 | do_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 |
