diff --git a/meta-networking/recipes-connectivity/samba/samba_4.23.11.bb b/meta-networking/recipes-connectivity/samba/samba_4.23.11.bb index 67c2646011..e498b30bcb 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.23.11.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.23.11.bb @@ -50,6 +50,9 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS # remove default added RDEPENDS on perl RDEPENDS:${PN}:remove = "perl" +RCONFLICTS:${PN} = "libldb" +RCONFLICTS:${PN}-python3 = "pyldb" + DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka ngtcp2 bison-native" inherit features_check diff --git a/meta-networking/recipes-support/libldb/libldb_2.9.2.bb b/meta-networking/recipes-support/libldb/libldb_2.9.2.bb index a212b6d2ef..c5699ad189 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.9.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.9.2.bb @@ -5,6 +5,8 @@ LICENSE = "GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later" DEPENDS += "libtdb libtalloc libtevent popt cmocka" RDEPENDS:pyldb += "python3" +RCONFLICTS:${PN} = "samba" +RCONFLICTS:pyldb = "samba-python3" export PYTHONHASHSEED = "1" export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"