[oe-commits] [meta-openembedded] 43/58: samba: remove unneeded conditionals for sysvinit and systemd

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit b5b6d22549e0796f44649760bbefcdd5f51ba4a8
Author: Andreas Oberritter <obi at opendreambox.org>
AuthorDate: Wed Nov 30 13:03:50 2016 +0100

    samba: remove unneeded conditionals for sysvinit and systemd
    
    systemd.bbclass takes care of deleting unused startup scripts.
    
    Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 47eb266..e758988 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -160,7 +160,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \
                     ${localstatedir}/lib/samba \
                     ${localstatedir}/nmbd \
                     ${localstatedir}/spool/samba \
-"
+                    ${systemd_unitdir}/system/nmb.service \
+                    ${systemd_unitdir}/system/smb.service"
 
 FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
                           ${bindir}/ctdb_run_cluster_tests \
@@ -285,13 +286,8 @@ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
 FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \
 "
 
-SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service"
-SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d"
-FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}"
-FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SMB_SYSV}', '', d)}"
-
-FILES_libwinbind = "${base_libdir}/security/pam_winbind.so"
-FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}"
+FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \
+                    ${systemd_unitdir}/system/winbind.service"
 FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
 
 FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.