Samba and libldb overlap in a few places. This is the simplest fix for
now.
Use "sssd" DISTRO_FEATUE to test and enable changes
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
recipes-support/libldb/libldb_%.bbappend | 1 +
recipes-support/libldb/libldb_sssd.inc | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 recipes-support/libldb/libldb_%.bbappend
create mode 100644 recipes-support/libldb/libldb_sssd.inc
diff --git a/recipes-support/libldb/libldb_%.bbappend
b/recipes-support/libldb/libldb_%.bbappend
new file mode 100644
index 0000000..bb81700
--- /dev/null
+++ b/recipes-support/libldb/libldb_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'sssd', '${BPN}_sssd.inc', '',
d)}
diff --git a/recipes-support/libldb/libldb_sssd.inc
b/recipes-support/libldb/libldb_sssd.inc
new file mode 100644
index 0000000..2633a1e
--- /dev/null
+++ b/recipes-support/libldb/libldb_sssd.inc
@@ -0,0 +1,22 @@
+# This fixes this issue:
+#ERROR: sssd-1.16.3-r0 do_prepare_recipe_sysroot: The file
/usr/lib/python2.7/site-packages/_ldb_text.py is installed by both libldb and
samba, aborting
+
+EXTRA_OECONF += "--disable-python"
+
+#Error: Transaction check error:
+# file /usr/bin/ldbadd conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+# file /usr/bin/ldbdel conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+# file /usr/bin/ldbedit conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+# file /usr/bin/ldbmodify conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+# file /usr/bin/ldbrename conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+# file /usr/bin/ldbsearch conflicts between attempted installs of
samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and
libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4
+
+do_install_append() {
+ rm -f ${D}${bindir}/ldbadd
+ rm -f ${D}${bindir}/ldbdel
+ rm -f ${D}${bindir}/ldbedit
+ rm -f ${D}${bindir}/ldbmodify
+ rm -f ${D}${bindir}/ldbrename
+ rm -f ${D}${bindir}/ldbsearch
+ rmdir ${D}${bindir}
+}
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
