aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-04-29 11:43:39 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2016-05-05 11:41:28 -0400
commitf59daf6caa9fe75ef9b9d9c715fc7e58a3a93ed4 (patch)
tree1856563281cf66f9aee7364f0382f337342e8baf /meta-networking
parent8cd5bc534612f064458bcc09d39d666c6912b795 (diff)
downloadmeta-openembedded-contrib-f59daf6caa9fe75ef9b9d9c715fc7e58a3a93ed4.tar.gz
samba: remove dependency on ctdb
During rootfs creation the following error is being hit Preparing... ######################################## [ 0%] warning: Removing ctdb-2.5.1-r0@core2_64 due to file /usr/bin/ctdb conflicting with samba-4.4.2-r0@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@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.bb2
1 files changed, 1 insertions, 1 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 383c9c9002..6a2220ac17 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"