OpenLDAP modules
PATCH 1/1 OpenLDAP modules
--- .../recipes-support/openldap/openldap_2.4.42.bb | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
meta-oe/recipes-support/openldap/openldap_2.4.42.bb +27 -1
@@ -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
@@ -166,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/*"
@@ -195,6 +197,18 @@ 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 + + # 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"
@@ -206,8 +220,20 @@ 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"
Signature · 1 line
2.5.0
By the way, I wonder if there is a way to write test that would launch OpenLDAP in Qemu and check that OpenLDAP can answer a request for example, and not just build and fail at runtime ...
Also would it be a good idea to write a readme to show some example on how to use the recipe, or would it be better in the recipe comment header ? Because I struggled a bit to find out and a simple example could have save me time.
Thanks
Bruno
Quoted 82 lines · BrunoVernay
--- .../recipes-support/openldap/openldap_2.4.42.bb | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)meta-oe/recipes-support/openldap/openldap_2.4.42.bb +2
-1@@ -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@@ -166,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/*"meta-oe/recipes-support/openldap/openldap_2.4.42.bb +0
-0@@ -195,6 +197,18 @@ 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
meta-oe/recipes-support/openldap/openldap_2.4.42.bb +7
-0+ + # 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/%'\
meta-oe/recipes-support/openldap/openldap_2.4.42.bb +17
-0+ -i ${D}${sysconfdir}/openldap/slapd.conf + + mkdir -p ${D}${localstatedir}/${BPN}/data + + } INITSCRIPT_PACKAGES = "${PN}-slapd"@@ -206,8 +220,20 @@ 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
Quoted 3 lines · Bruno Vernay
By the way, I wonder if there is a way to write test that would launch OpenLDAP in Qemu and check that OpenLDAP can answer a request for example, and not just build and fail at runtime ...
sure. look into ptest framework.
https://wiki.yoctoproject.org/wiki/Ptest
Quoted 96 lines
Also would it be a good idea to write a readme to show some example on how to use the recipe, or would it be better in the recipe comment header ? Because I struggled a bit to find out and a simple example could have save me time.
Thanks
BrunoQuoted 77 lines · BrunoVernay
--- .../recipes-support/openldap/openldap_2.4.42.bb | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)meta-oe/recipes-support/openldap/openldap_2.4.42.bb +2
-1@@ -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@@ -166,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/*"meta-oe/recipes-support/openldap/openldap_2.4.42.bb +0
-0@@ -195,6 +197,18 @@ 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
meta-oe/recipes-support/openldap/openldap_2.4.42.bb +7
-0+ + # 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/%'\
meta-oe/recipes-support/openldap/openldap_2.4.42.bb +17
-0+ -i ${D}${sysconfdir}/openldap/slapd.conf + + mkdir -p ${D}${localstatedir}/${BPN}/data + + } INITSCRIPT_PACKAGES = "${PN}-slapd"@@ -206,8 +220,20 @@ 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)
Quoted 5 lines
metapkg = "${PN}-backends"--
2.5.0--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 1 line · BrunoVernay
---
Please follow
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
and improve commit message and add your SOB-line.
Quoted 73 lines
.../recipes-support/openldap/openldap_2.4.42.bb | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)meta-oe/recipes-support/openldap/openldap_2.4.42.bb +27
-1@@ -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@@ -166,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/*"@@ -195,6 +197,18 @@ 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 + + # 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"@@ -206,8 +220,20 @@ 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"Signature · 7 lines
2.5.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]