[yocto] [meta-cgl][PATCH 10/10] heartbeat: properly handle systemd DISTRO_FEATURE

[Dmitry Eremin-Solenikov]

Always inherit systemd bbclass (otherwise it is not pulled in even if
systemd is enabled). This makes few other settings in the recipe
unnecessary, thus they are dropped.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
---
 meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
index 5128c53..3a02d35 100644
--- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
@@ -100,10 +100,8 @@ do_install() {
     install -m 0600 ${S}/doc/authkeys ${D}/etc/ha.d/authkeys
 }
 
-inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)}
-SYSTEMD_PACKAGES = "${PN}"
+inherit systemd
 SYSTEMD_SERVICE_${PN} = "heartbeat.service"
-SYSTEMD_AUTO_ENABLE = "disable"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r haclient"
-- 
2.1.4