helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-22 01:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: Fix qa issue and update ctdb-tests

Browse Source 
Fix file-rdeps QA warning by replace shell interpreter of script
${bindir}/onnode with /bin/sh that it doesn't has any bashism.

File ${bindir}/ctdb_run_cluster_tests which is a link to
${bindir}/ctdb_run_tests is split into package samba. That causes wrong
runtime dependency that samba depends on samba-ctdb-tests. Split the
file to samba-ctdb-tests to fix the issue.

Script ctdb_run_tests calls command 'getopt', so add runtime dependency
util-linux-getopt. Install config file and test cases for
samba-ctdt-tests at same time.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Kai Kang 2016-11-17 13:37:35 +08:00 committed by Joe MacDonald
parent f16b1c0d01
commit 42dd4ee1b3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
View File

@ -50,7 +50,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVIN
"
RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}"
RDEPENDS_${PN}-ctdb-tests += "bash"
RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt"
PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
@ -129,6 +129,19 @@ do_install_append() {
install -d ${D}${sysconfdir}/sysconfig/
install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba
# install ctdb config file and test cases
install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes
# the items are from ctdb/tests/run_tests.sh
for d in onnode takeover tool eventscripts cunit simple complex; do
testdir=${D}${datadir}/ctdb-tests/$d
install -d $testdir
cp ${S}/ctdb/tests/$d/*.sh $testdir
cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true
done
# fix file-rdeps qa warning
sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
@ -147,6 +160,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \
"
FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
${bindir}/ctdb_run_cluster_tests \
${sysconfdir}/ctdb/nodes \
${libdir}/ctdb-tests \
${datadir}/ctdb-tests \
/run/ctdb \