[meta-virtualization] [PATCH] docker: remove unnecessary checks

[Bruce Ashfield]

On Wed, Mar 14, 2018 at 4:39 AM, Pascal Bach <pascal.bach at siemens.com> wrote:
> The variables only take effect if the corresponding init system is enabled

Not in my experience. Can you point me to the oe-core commit that
changed this behaviour ?

Bruce

>
> Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
> ---
>  recipes-containers/docker/docker_git.bb | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
> index 5ae9211..5c21138 100644
> --- a/recipes-containers/docker/docker_git.bb
> +++ b/recipes-containers/docker/docker_git.bb
> @@ -117,13 +117,13 @@ do_compile() {
>      go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker github.com/docker/cli/cmd/docker
>  }
>
> -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
> -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"
> +SYSTEMD_PACKAGES = "${PN}"
> +SYSTEMD_SERVICE_${PN} = "docker.service"
>
>  SYSTEMD_AUTO_ENABLE_${PN} = "enable"
>
> -INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
> -INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
> +INITSCRIPT_PACKAGES += "${PN}"
> +INITSCRIPT_NAME_${PN} = "docker.init"
>  INITSCRIPT_PARAMS_${PN} = "defaults"
>
>  do_install() {
> --
> 2.11.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"