summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-08-04 23:40:15 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2016-08-05 09:13:17 -0400
commit32a6fd48ab781c15c37551f4e8ed6721ca5cb87b (patch)
tree38c24ea08efb5bddb3f1da4270ffe4685d385a1b /meta-networking
parent8b28f076f91c4ffa6ff9bb6e5df9df6603cd446e (diff)
downloadmeta-openembedded-32a6fd48ab781c15c37551f4e8ed6721ca5cb87b.tar.gz
samba: inherit update-rc.d to manage init script
inherit update-rc.d to manage init script, so we can avoid duplicating the update-rc.d commands, and the default behavior can be easily overridden by distro. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.2.bb9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
index b7ee73075..1a5d54f16 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -24,7 +24,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
24SRC_URI[md5sum] = "03a65a3adf08ceb1636ad59d234d7f9d" 24SRC_URI[md5sum] = "03a65a3adf08ceb1636ad59d234d7f9d"
25SRC_URI[sha256sum] = "eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a" 25SRC_URI[sha256sum] = "eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a"
26 26
27inherit systemd waf-samba cpan-base perlnative 27inherit systemd waf-samba cpan-base perlnative update-rc.d
28# remove default added RDEPENDS on perl 28# remove default added RDEPENDS on perl
29RDEPENDS_${PN}_remove = "perl" 29RDEPENDS_${PN}_remove = "perl"
30 30
@@ -33,6 +33,9 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld
33SYSVINITTYPE_linuxstdbase = "lsb" 33SYSVINITTYPE_linuxstdbase = "lsb"
34SYSVINITTYPE = "sysv" 34SYSVINITTYPE = "sysv"
35 35
36INITSCRIPT_NAME = "samba.sh"
37INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
38
36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
37 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
38 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 41 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
@@ -102,8 +105,6 @@ do_install_append() {
102 elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then 105 elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
103 install -d ${D}${sysconfdir}/init.d 106 install -d ${D}${sysconfdir}/init.d
104 install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d 107 install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d
105 update-rc.d -r ${D} samba.sh start 20 3 5 .
106 update-rc.d -r ${D} samba.sh start 20 0 1 6 .
107 elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then 108 elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then
108 install -d ${D}${sysconfdir}/init.d 109 install -d ${D}${sysconfdir}/init.d
109 install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh 110 install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh
@@ -112,8 +113,6 @@ do_install_append() {
112 -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ 113 -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
113 -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ 114 -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
114 -i ${D}${sysconfdir}/init.d/samba.sh 115 -i ${D}${sysconfdir}/init.d/samba.sh
115 update-rc.d -r ${D} samba.sh start 20 3 5 .
116 update-rc.d -r ${D} samba.sh start 20 0 1 6 .
117 fi 116 fi
118 117
119 install -d ${D}${sysconfdir}/samba 118 install -d ${D}${sysconfdir}/samba