Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 84831E00E0E; Wed, 14 Mar 2018 01:39:44 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [192.35.17.28 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 8F818E00823 for ; Wed, 14 Mar 2018 01:39:43 -0700 (PDT) Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w2E8df1O007348 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Mar 2018 09:39:42 +0100 Received: from dev.vm6.ccp.siemens.com ([167.87.15.61]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w2E8df3g019381; Wed, 14 Mar 2018 09:39:41 +0100 Received: from dev.vm6.ccp.siemens.com (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 77D4F10D3F8A; Wed, 14 Mar 2018 09:39:41 +0100 (CET) From: Pascal Bach To: meta-virtualization@yoctoproject.org Date: Wed, 14 Mar 2018 09:39:28 +0100 Message-Id: <20180314083928.20446-1-pascal.bach@siemens.com> X-Mailer: git-send-email 2.11.0 Subject: [PATCH] docker: remove unnecessary checks X-BeenThere: meta-virtualization@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Discussion of layer enabling hypervisor, virtualization tool stack, and cloud support" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 08:39:44 -0000 The variables only take effect if the corresponding init system is enabled Signed-off-by: Pascal Bach --- 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