meta-oe has updated to 2.4.43. Use a wilcard for minor numbers because they change very rapidly.
Signed-off-by: Ioan-Adrian Ratiu <[email protected]> --- .../openldap/openldap_2.4.%.bbappend | 73 ++++++++++++++++++++++ .../openldap/openldap_2.4.39.bbappend | 73 ---------------------- 2 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 meta-openstack/recipes-support/openldap/openldap_2.4.%.bbappend delete mode 100644 meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend diff --git a/meta-openstack/recipes-support/openldap/openldap_2.4.%.bbappend b/meta-openstack/recipes-support/openldap/openldap_2.4.%.bbappend new file mode 100644 index 0000000..63f6064 --- /dev/null +++ b/meta-openstack/recipes-support/openldap/openldap_2.4.%.bbappend @@ -0,0 +1,73 @@ +DEPEND_${PN} += "cyrus-sasl" +RDEPEND_${PN} += "libsasl2-modules" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SRC_URI += "file://initscript" +SRC_URI += "file://ops-base.ldif" + +LDAP_DN ?= "dc=my-domain,dc=com" +LDAP_DATADIR ?= "/etc/openldap-data/" + +OPENLDAP_LIBEXECDIR = "${libexecdir}" + +EXTRA_OECONF += "--libexecdir=${OPENLDAP_LIBEXECDIR}" + +do_install_append() { + install -D -m 0755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/openldap + sed -i -e 's/%DEFAULT_DN%/${LDAP_DN}/g' ${D}${sysconfdir}/init.d/openldap + sed -i -e 's#%LDAP_DATADIR%#${LDAP_DATADIR}#g' ${D}${sysconfdir}/init.d/openldap + # Base openldat bb installs slapd under ${sbin} + sed -i -e 's#%LIBEXEC%#${sbindir}#g' ${D}${sysconfdir}/init.d/openldap + + # This is duplicated in /etc/openldap and is for slapd + rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example + rm -rf "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + + # remove symlinks for backends, recreating in postinstall + rm -f ${D}/${OPENLDAP_LIBEXECDIR}/openldap/*.so + + sed -i -e '/^include\s*/a \ +include /etc/openldap/schema/cosine.schema \ +include /etc/openldap/schema/nis.schema \ +include /etc/openldap/schema/inetorgperson.schema \ +include /etc/openldap/schema/misc.schema' \ + ${D}/etc/openldap/slapd.conf + + sed -i -e '/^# Load dynamic backend modules:/a \ +modulepath ${OPENLDAP_LIBEXECDIR}/openldap \ +moduleload back_bdb.la' \ + ${D}/etc/openldap/slapd.conf + + sed -i -e 's#^pidfile\s*.*$#pidfile ${LDAP_DATADIR}/slapd.pid#' ${D}/etc/openldap/slapd.conf + sed -i -e 's#^argsfile\s*.*$#argsfile ${LDAP_DATADIR}/slapd.args#' ${D}/etc/openldap/slapd.conf + sed -i -e 's#^directory\s*.*$#directory ${LDAP_DATADIR}/#' ${D}/etc/openldap/slapd.conf + + sed -i -e 's/dc=my-domain,dc=com/${LDAP_DN}/g' ${D}/etc/openldap/slapd.conf + + # modify access perms for ldap/authentication + sed -i -e '$a\ +\ +access to attrs=userPassword \ + by self write \ + by anonymous auth \ + by * none \ +\ +access to * \ + by self write \ + by * read' \ + ${D}/etc/openldap/slapd.conf + + install -D -m 0644 ${WORKDIR}/ops-base.ldif ${D}/etc/openldap/ops-base.ldif + sed -i -e 's/dc=my-domain,dc=com/${LDAP_DN}/g' ${D}/etc/openldap/ops-base.ldif + + mkdir ${D}/${LDAP_DATADIR} +} + +inherit update-rc.d + +INITSCRIPT_NAME = "openldap" +INITSCRIPT_PARAMS = "defaults" + +FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif" +FILES_${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug" diff --git a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend b/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend deleted file mode 100644 index 63f6064..0000000 --- a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend +++ /dev/null @@ -1,73 +0,0 @@ -DEPEND_${PN} += "cyrus-sasl" -RDEPEND_${PN} += "libsasl2-modules" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://initscript" -SRC_URI += "file://ops-base.ldif" - -LDAP_DN ?= "dc=my-domain,dc=com" -LDAP_DATADIR ?= "/etc/openldap-data/" - -OPENLDAP_LIBEXECDIR = "${libexecdir}" - -EXTRA_OECONF += "--libexecdir=${OPENLDAP_LIBEXECDIR}" - -do_install_append() { - install -D -m 0755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/openldap - sed -i -e 's/%DEFAULT_DN%/${LDAP_DN}/g' ${D}${sysconfdir}/init.d/openldap - sed -i -e 's#%LDAP_DATADIR%#${LDAP_DATADIR}#g' ${D}${sysconfdir}/init.d/openldap - # Base openldat bb installs slapd under ${sbin} - sed -i -e 's#%LIBEXEC%#${sbindir}#g' ${D}${sysconfdir}/init.d/openldap - - # This is duplicated in /etc/openldap and is for slapd - rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example - rm -rf "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - - # remove symlinks for backends, recreating in postinstall - rm -f ${D}/${OPENLDAP_LIBEXECDIR}/openldap/*.so - - sed -i -e '/^include\s*/a \ -include /etc/openldap/schema/cosine.schema \ -include /etc/openldap/schema/nis.schema \ -include /etc/openldap/schema/inetorgperson.schema \ -include /etc/openldap/schema/misc.schema' \ - ${D}/etc/openldap/slapd.conf - - sed -i -e '/^# Load dynamic backend modules:/a \ -modulepath ${OPENLDAP_LIBEXECDIR}/openldap \ -moduleload back_bdb.la' \ - ${D}/etc/openldap/slapd.conf - - sed -i -e 's#^pidfile\s*.*$#pidfile ${LDAP_DATADIR}/slapd.pid#' ${D}/etc/openldap/slapd.conf - sed -i -e 's#^argsfile\s*.*$#argsfile ${LDAP_DATADIR}/slapd.args#' ${D}/etc/openldap/slapd.conf - sed -i -e 's#^directory\s*.*$#directory ${LDAP_DATADIR}/#' ${D}/etc/openldap/slapd.conf - - sed -i -e 's/dc=my-domain,dc=com/${LDAP_DN}/g' ${D}/etc/openldap/slapd.conf - - # modify access perms for ldap/authentication - sed -i -e '$a\ -\ -access to attrs=userPassword \ - by self write \ - by anonymous auth \ - by * none \ -\ -access to * \ - by self write \ - by * read' \ - ${D}/etc/openldap/slapd.conf - - install -D -m 0644 ${WORKDIR}/ops-base.ldif ${D}/etc/openldap/ops-base.ldif - sed -i -e 's/dc=my-domain,dc=com/${LDAP_DN}/g' ${D}/etc/openldap/ops-base.ldif - - mkdir ${D}/${LDAP_DATADIR} -} - -inherit update-rc.d - -INITSCRIPT_NAME = "openldap" -INITSCRIPT_PARAMS = "defaults" - -FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif" -FILES_${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug" -- 2.7.0 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
