summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb17
1 files changed, 16 insertions, 1 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 a27bcd1e6b..303d5ae2e3 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -50,7 +50,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVIN
50" 50"
51 51
52RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}" 52RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}"
53RDEPENDS_${PN}-ctdb-tests += "bash" 53RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt"
54 54
55PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" 55PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
56PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" 56PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
@@ -129,6 +129,19 @@ do_install_append() {
129 install -d ${D}${sysconfdir}/sysconfig/ 129 install -d ${D}${sysconfdir}/sysconfig/
130 install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba 130 install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba
131 131
132 # install ctdb config file and test cases
133 install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes
134 # the items are from ctdb/tests/run_tests.sh
135 for d in onnode takeover tool eventscripts cunit simple complex; do
136 testdir=${D}${datadir}/ctdb-tests/$d
137 install -d $testdir
138 cp ${S}/ctdb/tests/$d/*.sh $testdir
139 cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true
140 done
141
142 # fix file-rdeps qa warning
143 sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode
144
132 rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log 145 rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
133} 146}
134 147
@@ -147,6 +160,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \
147" 160"
148 161
149FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ 162FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
163 ${bindir}/ctdb_run_cluster_tests \
164 ${sysconfdir}/ctdb/nodes \
150 ${libdir}/ctdb-tests \ 165 ${libdir}/ctdb-tests \
151 ${datadir}/ctdb-tests \ 166 ${datadir}/ctdb-tests \
152 /run/ctdb \ 167 /run/ctdb \