diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 13:03:55 +0100 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-16 20:47:13 -0500 |
commit | 505b35c89b988a6504d80b28eb68786d14a4549b (patch) | |
tree | a6fd11533b697268e9d28b5f54b334315ca7a248 /meta-networking/recipes-connectivity/samba | |
parent | d491c0bcf3da3fb61260fb1fcaab358879b3bce7 (diff) | |
download | meta-openembedded-505b35c89b988a6504d80b28eb68786d14a4549b.tar.gz |
samba: install systemd units and initscripts unconditionally
Fixes hybrid systemd/sysvinit setups.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 21 |
1 files changed, 10 insertions, 11 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 783a7cda4..aabc043b8 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -98,19 +98,18 @@ DISABLE_STATIC = "" | |||
98 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 98 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
99 | 99 | ||
100 | do_install_append() { | 100 | do_install_append() { |
101 | if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then | 101 | install -d ${D}${systemd_system_unitdir} |
102 | install -d ${D}${systemd_system_unitdir} | 102 | install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} |
103 | install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} | 103 | sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service |
104 | sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service | 104 | |
105 | 105 | install -d ${D}${sysconfdir}/tmpfiles.d | |
106 | install -d ${D}${sysconfdir}/tmpfiles.d | 106 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf |
107 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf | 107 | echo "d ${localstatedir}/log/samba 0755 root root -" \ |
108 | echo "d ${localstatedir}/log/samba 0755 root root -" \ | 108 | >> ${D}${sysconfdir}/tmpfiles.d/samba.conf |
109 | >> ${D}${sysconfdir}/tmpfiles.d/samba.conf | 109 | if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then |
110 | elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then | ||
111 | install -d ${D}${sysconfdir}/init.d | 110 | install -d ${D}${sysconfdir}/init.d |
112 | install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba | 111 | install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba |
113 | elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then | 112 | else |
114 | install -d ${D}${sysconfdir}/init.d | 113 | install -d ${D}${sysconfdir}/init.d |
115 | install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba | 114 | install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba |
116 | sed -e 's,/opt/samba/bin,${sbindir},g' \ | 115 | sed -e 's,/opt/samba/bin,${sbindir},g' \ |