From 9ecd97eba160081fdebff3d3f01b737542a5533f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 30 Nov 2016 13:03:50 +0100 Subject: samba: remove unneeded conditionals for sysvinit and systemd systemd.bbclass takes care of deleting unused startup scripts. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta-networking') 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 47eb2664af..e758988958 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 \ -- cgit 1.2.3-korg