[PATCH 1/3] Fixes runtime error when loading modules

[PATCH 1/3] Fixes runtime error when loading modules

[BrunoVernay]

Signed-off-by: BrunoVernay <BrunoVern.a@gmail.com>
---
 meta-oe/recipes-support/openldap/openldap_2.4.42.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
index 49fcb56..caca16b 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
@@ -148,6 +148,8 @@ PACKAGES += "${PN}-overlay-proxycache"
 # it was disabled for cross-compiling.
 CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\'"
 
+LDFLAGS += "-pthread"
+
 do_configure() {
     cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build
     rm -f ${S}/libtool
-- 
2.5.0

[PATCH 2/3] Modules require .so libraries to be present

[BrunoVernay]

Signed-off-by: BrunoVernay <BrunoVern.a@gmail.com>
---
 meta-oe/recipes-support/openldap/openldap_2.4.42.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
index caca16b..5f71930 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
@@ -197,6 +197,11 @@ do_install_append() {
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/
     sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service
+    
+    # OpenLDAP will search for .so and .la if no extension is specified
+    sed -e 's/# modulepath/modulepath/' \
+        -e 's/# moduleload\s*back_bdb.*/moduleload    back_mdb/' \
+        -i ${D}${sysconfdir}/openldap/slapd.conf
 }
 
 INITSCRIPT_PACKAGES = "${PN}-slapd"
@@ -208,8 +213,19 @@ SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable"
 
 PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*"
 
+# The modules require their .so to be dynamicaly loaded
+INSANE_SKIP_${PN}-backend-dnssrv  += "dev-so"
+INSANE_SKIP_${PN}-backend-ldap    += "dev-so"
+INSANE_SKIP_${PN}-backend-meta    += "dev-so"
+INSANE_SKIP_${PN}-backend-mdb     += "dev-so"
+INSANE_SKIP_${PN}-backend-monitor += "dev-so"
+INSANE_SKIP_${PN}-backend-null    += "dev-so"
+INSANE_SKIP_${PN}-backend-passwd  += "dev-so"
+INSANE_SKIP_${PN}-backend-shell   += "dev-so"
+
 python populate_packages_prepend () {
     backend_dir    = d.expand('${libexecdir}/openldap')
+    do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True)
     do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
 
     metapkg = "${PN}-backends"
-- 
2.5.0

[PATCH 3/3] Creates a coherent and working default configuration

[BrunoVernay]

Signed-off-by: BrunoVernay <BrunoVern.a@gmail.com>
---
 meta-oe/recipes-support/openldap/openldap_2.4.42.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
index 5f71930..1c59db8 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
@@ -168,7 +168,7 @@ LEAD_SONAME = "libldap-${LDAP_VER}.so.*"
 PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin"
 
 # Package contents - shift most standard contents to -bin
-FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/openldap-data"
+FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data"
 FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \
     ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \
     ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*"
@@ -198,10 +198,15 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/
     sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service
     
-    # OpenLDAP will search for .so and .la if no extension is specified
+    # Uses mdm as the database
+    #  and localstatedir as data directory ...
     sed -e 's/# modulepath/modulepath/' \
         -e 's/# moduleload\s*back_bdb.*/moduleload    back_mdb/' \
+        -e 's/database\s*bdb/database        mdb/' \
+        -e 's%^directory\s*.*%directory   ${localstatedir}/${BPN}/data/%' \
         -i ${D}${sysconfdir}/openldap/slapd.conf
+
+    mkdir -p ${D}${localstatedir}/${BPN}/data
 }
 
 INITSCRIPT_PACKAGES = "${PN}-slapd"
-- 
2.5.0

Re: [PATCH 1/3] Fixes runtime error when loading modules

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

On Sun, Jan 31, 2016 at 06:19:01PM +0100, BrunoVernay wrote:
> Signed-off-by: BrunoVernay <BrunoVern.a@gmail.com>

openldap in master was upgraded to 2.4.43 more than month ago:

commit 03d613e570ae262b32322d1fa2eeb47c38518478
Author:     fan.xin <fan.xin@jp.fujitsu.com>
AuthorDate: Fri Dec 11 09:50:39 2015 +0900
Commit:     Martin Jansa <Martin.Jansa@gmail.com>
CommitDate: Fri Dec 18 12:43:22 2015 +0100

    openldap: upgrade to 2.4.43

Rebase, re-verify and re-send with subject following:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Regards,

> ---
>  meta-oe/recipes-support/openldap/openldap_2.4.42.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> index 49fcb56..caca16b 100644
> --- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> +++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> @@ -148,6 +148,8 @@ PACKAGES += "${PN}-overlay-proxycache"
>  # it was disabled for cross-compiling.
>  CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\'"
>  
> +LDFLAGS += "-pthread"
> +
>  do_configure() {
>      cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build
>      rm -f ${S}/libtool
> -- 
> 2.5.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 1/3] Fixes runtime error when loading modules

[Bruno Vernay]

I checked out on master and my changes are already there and I confirm that
it works.
http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/openldap/openldap_2.4.43.bb?id=f3b3c1fdd88f3084c3cea11cd39e86216ba93218

I am currently writing ptest, I was able to find examples, it is on going.
But, I am still wondering that there are no documentation on how to use the
recipe, people are really expected to read the recipe source and find out?

Bruno

On Mon, Feb 1, 2016 at 4:17 PM Martin Jansa <martin.jansa@gmail.com> wrote:

> On Sun, Jan 31, 2016 at 06:19:01PM +0100, BrunoVernay wrote:
> > Signed-off-by: BrunoVernay <BrunoVern.a@gmail.com>
>
> openldap in master was upgraded to 2.4.43 more than month ago:
>
> commit 03d613e570ae262b32322d1fa2eeb47c38518478
> Author:     fan.xin <fan.xin@jp.fujitsu.com>
> AuthorDate: Fri Dec 11 09:50:39 2015 +0900
> Commit:     Martin Jansa <Martin.Jansa@gmail.com>
> CommitDate: Fri Dec 18 12:43:22 2015 +0100
>
>     openldap: upgrade to 2.4.43
>
> Rebase, re-verify and re-send with subject following:
> http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
>
> Regards,
>
> > ---
> >  meta-oe/recipes-support/openldap/openldap_2.4.42.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> > index 49fcb56..caca16b 100644
> > --- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> > +++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
> > @@ -148,6 +148,8 @@ PACKAGES += "${PN}-overlay-proxycache"
> >  # it was disabled for cross-compiling.
> >  CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\'"
> >
> > +LDFLAGS += "-pthread"
> > +
> >  do_configure() {
> >      cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build
> >      rm -f ${S}/libtool
> > --
> > 2.5.0
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>