[oe-commits] [meta-openembedded] 09/15: samba: update systemd service files

[git at git.openembedded.org]

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit 038a0031a4f73ffad2a165134ee35fa61748a244
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Jan 27 14:30:57 2016 +0800

    samba: update systemd service files
    
    Update systemd service files of samba. There are no '@BASE_BINDIR@' and
    '@SBINDIR@' in these service files, so drop the original replacement.
    Command kill is installed to /bin/kill, then correct in the service files.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
index 62cd661..3bcc1b9 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
@@ -125,9 +125,7 @@ do_install_append() {
         for i in nmb smb winbind; do
             install -m 0644 packaging/systemd/$i.service ${D}${systemd_unitdir}/system
         done
-        sed -e 's, at BASE_BINDIR@,${base_bindir},g' \
-            -e 's, at SBINDIR@,${sbindir},g' \
-            -i ${D}${systemd_unitdir}/system/*.service
+        sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_unitdir}/system/*.service
 
 	install -d ${D}${sysconfdir}/tmpfiles.d
         install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.