[oe-commits] [meta-openembedded] 15/15: samba: remove dependency on ctdb
git at git.openembedded.org
git at git.openembedded.org
Mon May 2 16:41:49 UTC 2016
joe_macdonald pushed a commit to branch krogoth
in repository meta-openembedded.
commit cb87e40af9abc66ef3c720c863487329a39aa47a
Author: Mark Asselstine <mark.asselstine at windriver.com>
AuthorDate: Fri Apr 29 11:43:39 2016 -0400
samba: remove dependency on ctdb
During rootfs creation the following error is being hit
Preparing... ######################################## [ 0%]
warning: Removing ctdb-2.5.1-r0 at core2_64 due to file /usr/bin/ctdb
conflicting with samba-4.4.2-r0 at core2_64
error: ctdb-dev-2.5.1-r0 conflicts with ctdb = 2.5.1-r0
Looking at the relationship between samba and ctdb it appears that the
landscape has changed some starting in version 4.2. Samba now includes
and installs ctdb instead of relying on stand-alone ctdb. Referencing
https://wiki.samba.org/index.php/CTDB_Setup we see this activated by
'--with-cluster-support' which we do pass to configure based on the
bb.
Dropping the DEPENDS on ctdb resolves this issue.
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 383c9c9..6a2220a 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -27,7 +27,7 @@ inherit systemd waf-samba cpan-base perlnative
# remove default added RDEPENDS on perl
RDEPENDS_${PN}_remove = "perl"
-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 ctdb libbsd libaio"
+DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio"
SYSVINITTYPE_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list