aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-10-18 10:14:14 +0200
committerAndreas Oberritter <obi@opendreambox.org>2017-02-16 11:29:19 +0100
commitd766fbc0d5fc40ad716c4e94e2d498f3a006d022 (patch)
tree0725037a1c965870e354abfd6ba8eaf59ca20b34
parent7d6a9411f132421b2c37b128a2f55c0dc277d45e (diff)
downloadmeta-openembedded-contrib-d766fbc0d5fc40ad716c4e94e2d498f3a006d022.tar.gz
meta-openembedded-contrib-d766fbc0d5fc40ad716c4e94e2d498f3a006d022.tar.bz2
meta-openembedded-contrib-d766fbc0d5fc40ad716c4e94e2d498f3a006d022.zip
samba: remove unneeded conditionals for sysvinit and systemd
systemd.bbclass takes care of deleting unused startup scripts. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb12
1 files 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 ea9c9ac09e..f2b58ef8a2 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -138,7 +138,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 \
${libdir}/ctdb-tests \
@@ -261,13 +262,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 \