[yocto] [meta-cgl][PATCH 07/10] ocfs2-tools: 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/ocfs2-tools/ocfs2-tools_1.4.3.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
index 4e171f4..1296fd6 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
@@ -42,11 +42,8 @@ do_compile_prepend() {
     done
 }
 
-inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
+inherit systemd
 SYSTEMD_SERVICE_${PN} = "o2cb.service ocfs2.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-FILES_${PN} += "${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','${systemd_unitdir}','', d)}"
 
 do_install() {
     install -d ${D}/etc/init.d
-- 
2.1.4