diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-10-18 10:26:34 +0200 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2017-02-16 11:29:20 +0100 |
commit | 84883f38fcb303c551fc7ddabb574bd12acf21c9 (patch) | |
tree | f1d3aaf30ffc73297a5857013ac64e2f5dd6da53 /meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |
parent | 20a31196fd8193e19c06a7c5deeffcec55e2c161 (diff) | |
download | meta-openembedded-contrib-84883f38fcb303c551fc7ddabb574bd12acf21c9.tar.gz |
samba: install systemd units and initscripts unconditionally
Fixes hybrid systemd/sysvinit setups.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba_4.4.5.bb')
-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 755f2e7e4b..52819ebb0d 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -91,19 +91,18 @@ DISABLE_STATIC = "" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} - 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 - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} + 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 + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba - elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then + else install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba sed -e 's,/opt/samba/bin,${sbindir},g' \ |