From 4c84a134a256d5190788e20bdc625ba4b7026c31 Mon Sep 17 00:00:00 2001 From: Nam Ninh Date: Thu, 17 Sep 2015 11:17:17 -0400 Subject: openldap: fix various build failures Fix wrong hard-coded OPENLDAP_LIBEXECDIR that causes the following build failure: mv: cannot stat `/bitbake_build/tmp/work/core2-64-wrs-linux/openldap/2.4.39-r0/image/usr/lib64/openldap/slapd': No such file or directory The base openldat bb installs slapd under ${sbindir}, so LIBEXEC should be replaced with sbindir instead of OPENLDAP_LIBEXECDIR. The "run" directory is already removed in the base bb, so removing the second time causes this build failure: rmdir: failed to remove `/bitbake_build/tmp/work/core2-64-wrs-linux/openldap/2.4.39-r0/image/var/run': No such file or directory Finally, ops-base.ldif is needed in the initscript, so we also include it in the package. Signed-off-by: Nam Ninh Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta-openstack/recipes-support') diff --git a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend b/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend index 296e275..63f6064 100644 --- a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend +++ b/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend @@ -8,7 +8,7 @@ SRC_URI += "file://ops-base.ldif" LDAP_DN ?= "dc=my-domain,dc=com" LDAP_DATADIR ?= "/etc/openldap-data/" -OPENLDAP_LIBEXECDIR = "/usr/libexec" +OPENLDAP_LIBEXECDIR = "${libexecdir}" EXTRA_OECONF += "--libexecdir=${OPENLDAP_LIBEXECDIR}" @@ -16,11 +16,12 @@ 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 - sed -i -e 's#%LIBEXEC%#${OPENLDAP_LIBEXECDIR}#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 - rmdir "${D}${localstatedir}/run" + rm -rf "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" # remove symlinks for backends, recreating in postinstall @@ -68,5 +69,5 @@ inherit update-rc.d INITSCRIPT_NAME = "openldap" INITSCRIPT_PARAMS = "defaults" -FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/*" +FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif" FILES_${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug" -- cgit v1.2.3-54-g00ecf