[oe] [meta-networking][PATCH 01/10] samba: rename initscript from 'samba.sh' to more common 'samba'
Joe MacDonald
joe_macdonald at mentor.com
Sat Dec 17 16:04:49 UTC 2016
From: Andreas Oberritter <obi at opendreambox.org>
This gets masked automatically by samba.service if systemd is running.
Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 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 6d62481..783a7cd 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc"
SYSVINITTYPE_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv"
-INITSCRIPT_NAME = "samba.sh"
+INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
@@ -109,16 +109,16 @@ do_install_append() {
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
elif ${@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
+ install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
- install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh
+ install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba
sed -e 's,/opt/samba/bin,${sbindir},g' \
-e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
-e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
- -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
+ -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \
-e 's,/usr/bin,${base_bindir},g' \
- -i ${D}${sysconfdir}/init.d/samba.sh
+ -i ${D}${sysconfdir}/init.d/samba
fi
install -d ${D}${sysconfdir}/samba
--
1.9.1
More information about the Openembedded-devel
mailing list