aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-10-18 10:16:51 +0200
committerAndreas Oberritter <obi@opendreambox.org>2017-02-16 11:29:19 +0100
commit2e92370938b61faf339ec1f3599169fa8ce5728a (patch)
tree6a1b4bc9db9f41e51c8f1a63ce94a7d1675fd1b8
parentd766fbc0d5fc40ad716c4e94e2d498f3a006d022 (diff)
downloadmeta-openembedded-contrib-2e92370938b61faf339ec1f3599169fa8ce5728a.tar.gz
meta-openembedded-contrib-2e92370938b61faf339ec1f3599169fa8ce5728a.tar.bz2
meta-openembedded-contrib-2e92370938b61faf339ec1f3599169fa8ce5728a.zip
samba: use systemd_system_unitdir variable
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb15
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 f2b58ef8a2..3f4b7ca4cd 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -92,11 +92,11 @@ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-g
do_install_append() {
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
- install -m 0644 packaging/systemd/$i.service ${D}${systemd_unitdir}/system
+ install -m 0644 packaging/systemd/$i.service ${D}${systemd_system_unitdir}
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 -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -138,8 +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"
+ ${systemd_system_unitdir}/nmb.service \
+ ${systemd_system_unitdir}/smb.service"
FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
${libdir}/ctdb-tests \
@@ -252,8 +252,7 @@ FILES_winbind = "${sbindir}/winbindd \
${bindir}/wbinfo \
${bindir}/ntlm_auth \
${sysconfdir}/init.d/winbind \
- ${systemd_unitdir}/system/winbind.service \
-"
+ ${systemd_system_unitdir}/winbind.service"
FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
${libdir}/nss_info \
@@ -263,7 +262,7 @@ FILES_${PN} += "${base_libdir}/security/pam_smbpass.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_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \