There are conflicts with the samba python package so disable the python pkg by default to fix:
The pyldb has an RDEPENDS on samba which is causing issues with other packages. ERROR: The file /usr/lib/python2.7/site-packages/_ldb_text.py is installed by both libldb and samba, aborting Also cleanup per style guide Signed-off-by: Armin Kuster <[email protected]> --- .../recipes-support/libldb/libldb_1.4.1.bb | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/meta-networking/recipes-support/libldb/libldb_1.4.1.bb b/meta-networking/recipes-support/libldb/libldb_1.4.1.bb index 3c7e5455e9..c3865152e1 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.4.1.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.4.1.bb @@ -2,9 +2,9 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://ldb.samba.org"; SECTION = "libs" LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" - -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python samba" +LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ + file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ + file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://do-not-import-target-module-while-cross-compile.patch \ @@ -12,34 +12,32 @@ SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-libldb-fix-config-error.patch \ file://libldb-fix-musl-libc-unkown-type-error.patch \ file://libldb-fix-musl-libc-conflict-type-error.patch \ - " + ${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" + +SRC_URI[md5sum] = "159a1b1a56dcccf410d1bba911be6076" +SRC_URI[sha256sum] = "2df13aa25b376b314ce24182c37691959019523de3cc5356c40c1a333b0890a2" + +DEPENDS += "libtdb libtalloc libtevent popt" + +S = "${WORKDIR}/ldb-${PV}" + +inherit waf-samba distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" -PACKAGECONFIG ??= "\ +PACKAGECONFIG ?= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ " + PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[ldap] = ",,openldap" PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[python] = ",--disable-python, , python" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" - -LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ - file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ - file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" - -SRC_URI[md5sum] = "159a1b1a56dcccf410d1bba911be6076" -SRC_URI[sha256sum] = "2df13aa25b376b314ce24182c37691959019523de3cc5356c40c1a333b0890a2" - -inherit waf-samba distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" - -S = "${WORKDIR}/ldb-${PV}" - EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ --bundled-libraries=cmocka \ @@ -50,7 +48,7 @@ EXTRA_OECONF += "--disable-rpath \ --without-ldb-lmdb \ " -PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'pyldb pyldb-dbg pyldb-dev', '', d)}" NOAUTOPACKAGEDEBUG = "1" @@ -66,3 +64,5 @@ FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ ${libdir}/.debug/libpyldb-util.so.*" FILES_pyldb-dev = "${libdir}/libpyldb-util.so" + +RDEPENDS_pyldb += "samba" -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
