From c27765e057f17089746b9999dcd5a2f9c7716fe8 Mon Sep 17 00:00:00 2001 From: Himanshu Jadon Date: Thu, 20 Aug 2026 05:39:32 -0700 Subject: [PATCH] samba, libldb: add package conflicts samba package also installs LDB command line tools and python LDB module. libldb package installs the same tools and pyldb module from standalone LDB source. pkgdata shows the conflict clearly: samba: /usr/bin/ldbadd libldb: /usr/bin/ldbadd samba-python3: site-packages/ldb.so pyldb: site-packages/ldb.so So when both samba and libldb are added in same image, rootfs can fail because package manager sees same files from two different packages. Both package sets are not expected to be installed together. Add RCONFLICTS for samba/libldb and samba-python3/pyldb. This makes the conflict explicit during dependency resolution instead of failing later as file install conflict. Older meta-networking had similar conflict handling for samba/libldb in commit: https://git.openembedded.org/meta-openembedded/commit/?id=8e641e28f630dac61a03373ad70c72a2370ad11e This change adds the same handling again with current python3 package names. Signed-off-by: Himanshu Jadon Signed-off-by: Khem Raj (cherry picked from commit ee1c39e595286388ffb9e793892feec7d87977d7) Signed-off-by: Anuj Mittal --- meta-networking/recipes-connectivity/samba/samba_4.23.11.bb | 3 +++ meta-networking/recipes-support/libldb/libldb_2.8.2.bb | 2 ++ 2 files changed, 5 insertions(+) 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 c5bc3f8bc0..ea0a27dfd0 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.8.2.bb b/meta-networking/recipes-support/libldb/libldb_2.8.2.bb index 016b649cd9..63b4885bfb 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.8.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.8.2.bb @@ -5,6 +5,8 @@ LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-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}"