mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

samba: remove unneeded conditionals for sysvinit and systemd

Browse Source 
systemd.bbclass takes care of deleting unused startup scripts.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Andreas Oberritter
2016-11-30 13:03:50 +01:00
committed by Joe MacDonald
parent 78fa7f8d1c
commit 9ecd97eba1
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+4 -8
View File
@@ -160,7 +160,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \
${localstatedir}/lib/samba \ ${localstatedir}/lib/samba \
${localstatedir}/nmbd \ ${localstatedir}/nmbd \
${localstatedir}/spool/samba \ ${localstatedir}/spool/samba \
" ${systemd_unitdir}/system/nmb.service \
${systemd_unitdir}/system/smb.service"
FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
${bindir}/ctdb_run_cluster_tests \ ${bindir}/ctdb_run_cluster_tests \
@@ -285,13 +286,8 @@ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \
" "
SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service" FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \
SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d" ${systemd_unitdir}/system/winbind.service"
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-krb5-locator = "${libdir}/winbind_krb5_locator.so" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \