MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-07-19 15:29:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

samba: use systemd_system_unitdir variable

Browse Source 
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:51 +01:00 committed by Joe MacDonald
parent 9ecd97eba1
commit f38245280b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
View File

@ -99,11 +99,11 @@ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-g
do_install_append() { do_install_append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_system_unitdir}
for i in nmb smb winbind; do for i in nmb smb winbind; do
install -m 0644 packaging/systemd/$i.service ${D}${systemd_unitdir}/system install -m 0644 packaging/systemd/$i.service ${D}${systemd_system_unitdir}
done done
sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_unitdir}/system/*.service sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service
install -d ${D}${sysconfdir}/tmpfiles.d install -d ${D}${sysconfdir}/tmpfiles.d
install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf
@ -160,8 +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_system_unitdir}/nmb.service \
${systemd_unitdir}/system/smb.service" ${systemd_system_unitdir}/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 \
@ -276,8 +276,7 @@ FILES_winbind = "${sbindir}/winbindd \
${bindir}/wbinfo \ ${bindir}/wbinfo \
${bindir}/ntlm_auth \ ${bindir}/ntlm_auth \
${sysconfdir}/init.d/winbind \ ${sysconfdir}/init.d/winbind \
${systemd_unitdir}/system/winbind.service \ ${systemd_system_unitdir}/winbind.service"
"
FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
${libdir}/nss_info \ ${libdir}/nss_info \
@ -287,7 +286,7 @@ FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \
" "
FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \
${systemd_unitdir}/system/winbind.service" ${systemd_system_unitdir}/winbind.service"
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 \