diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 13:03:51 +0100 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-14 09:20:11 -0500 |
commit | f38245280bafa43dca830dc68c40cfae021473e6 (patch) | |
tree | 0eb7bc1689f9657a845d1c4593543110a9d96865 /meta-networking/recipes-connectivity | |
parent | 9ecd97eba160081fdebff3d3f01b737542a5533f (diff) | |
download | meta-openembedded-f38245280bafa43dca830dc68c40cfae021473e6.tar.gz |
samba: use systemd_system_unitdir variable
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>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 15 |
1 files changed, 7 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 e75898895..c296aa42a 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -99,11 +99,11 @@ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-g | |||
99 | 99 | ||
100 | do_install_append() { | 100 | do_install_append() { |
101 | if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then | 101 | if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then |
102 | install -d ${D}${systemd_unitdir}/system | 102 | install -d ${D}${systemd_system_unitdir} |
103 | for i in nmb smb winbind; do | 103 | for i in nmb smb winbind; do |
104 | install -m 0644 packaging/systemd/$i.service ${D}${systemd_unitdir}/system | 104 | install -m 0644 packaging/systemd/$i.service ${D}${systemd_system_unitdir} |
105 | done | 105 | done |
106 | sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_unitdir}/system/*.service | 106 | sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service |
107 | 107 | ||
108 | install -d ${D}${sysconfdir}/tmpfiles.d | 108 | install -d ${D}${sysconfdir}/tmpfiles.d |
109 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf | 109 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf |
@@ -160,8 +160,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \ | |||
160 | ${localstatedir}/lib/samba \ | 160 | ${localstatedir}/lib/samba \ |
161 | ${localstatedir}/nmbd \ | 161 | ${localstatedir}/nmbd \ |
162 | ${localstatedir}/spool/samba \ | 162 | ${localstatedir}/spool/samba \ |
163 | ${systemd_unitdir}/system/nmb.service \ | 163 | ${systemd_system_unitdir}/nmb.service \ |
164 | ${systemd_unitdir}/system/smb.service" | 164 | ${systemd_system_unitdir}/smb.service" |
165 | 165 | ||
166 | FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ | 166 | FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ |
167 | ${bindir}/ctdb_run_cluster_tests \ | 167 | ${bindir}/ctdb_run_cluster_tests \ |
@@ -276,8 +276,7 @@ FILES_winbind = "${sbindir}/winbindd \ | |||
276 | ${bindir}/wbinfo \ | 276 | ${bindir}/wbinfo \ |
277 | ${bindir}/ntlm_auth \ | 277 | ${bindir}/ntlm_auth \ |
278 | ${sysconfdir}/init.d/winbind \ | 278 | ${sysconfdir}/init.d/winbind \ |
279 | ${systemd_unitdir}/system/winbind.service \ | 279 | ${systemd_system_unitdir}/winbind.service" |
280 | " | ||
281 | 280 | ||
282 | FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ | 281 | FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ |
283 | ${libdir}/nss_info \ | 282 | ${libdir}/nss_info \ |
@@ -287,7 +286,7 @@ FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ | |||
287 | " | 286 | " |
288 | 287 | ||
289 | FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ | 288 | FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ |
290 | ${systemd_unitdir}/system/winbind.service" | 289 | ${systemd_system_unitdir}/winbind.service" |
291 | FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" | 290 | FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" |
292 | 291 | ||
293 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ | 292 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ |