starlingx/meta-starlingx
Code Issues Proposed changes

openldap: update for stx 5.0

Browse Source 
* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

* remove do_copy_config_files since it's not
  needed after using stx-metadata

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I7dbe85e9a6b38375b29bd927034c7e637983804b
This commit is contained in:
Jackie Huang 2021-05-12 16:26:46 +08:00
parent 18eaf0d9a9
commit eb4e712eee
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-stx-integ/recipes-support/openldap/openldap_%.bbappend
View File

@ -1,17 +1,16 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRCREV_FORMAT = "opendev" inherit stx-metadata
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "openldap-config" STX_REPO = "config-files"
DSTSUFX0 = "stx-configfiles" STX_SUBPATH = "openldap-config"
LICENSE_append = "& Apache-2.0" LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\ LIC_FILES_CHKSUM += "\
file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
" "
SRC_URI += " \ SRC_URI += " \
git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
file://rootdn-should-not-bypass-ppolicy.patch \ file://rootdn-should-not-bypass-ppolicy.patch \
file://0021-openldap-and-stx-source-and-config-files.patch \ file://0021-openldap-and-stx-source-and-config-files.patch \
" "
@ -109,14 +108,6 @@ EXTRA_OECONF += " \
# --enable-wrappers # --enable-wrappers
# --enable-moznss-compatibility=yes # --enable-moznss-compatibility=yes
do_unpack_append() {
bb.build.exec_func('do_copy_config_files', d)
}
do_copy_config_files () {
cp -pf ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE
}
do_configure_append () { do_configure_append () {
cd ${S} cd ${S}
ln -f -s ${S}/contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays ln -f -s ${S}/contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@ -162,16 +153,15 @@ do_install_append () {
sed -i -e 's:\(/sbin/runuser\):/usr\1:g' ${D}/usr/libexec/openldap/functions sed -i -e 's:\(/sbin/runuser\):/usr\1:g' ${D}/usr/libexec/openldap/functions
install -m 755 ${WORKDIR}/${DSTSUFX0}/files/initscript ${D}/${sysconfdir}/init.d/openldap install -m 755 ${STX_METADATA_PATH}/files/initscript ${D}/${sysconfdir}/init.d/openldap
install -m 600 ${WORKDIR}/${DSTSUFX0}/files/slapd.conf ${D}/${sysconfdir}/openldap/slapd.conf install -m 600 ${STX_METADATA_PATH}/files/slapd.conf ${D}/${sysconfdir}/openldap/slapd.conf
install -m 600 ${WORKDIR}/${DSTSUFX0}/files/initial_config.ldif ${D}/${sysconfdir}/openldap/initial_config.ldif install -m 600 ${STX_METADATA_PATH}/files/initial_config.ldif ${D}/${sysconfdir}/openldap/initial_config.ldif
# install -D -m 644 ${WORKDIR}/${DSTSUFX0}/files/slapd.service ${D}/${sysconfdir}/systemd/system/slapd.service install -D -m 644 ${STX_METADATA_PATH}/files/slapd.service ${D}/${systemd_system_unitdir}/slapd.service
install -D -m 644 ${WORKDIR}/${DSTSUFX0}/files/slapd.service ${D}/${systemd_system_unitdir}/slapd.service sed -i -e 's|/var/run|/run|' ${D}/${systemd_system_unitdir}/slapd.service
sed -i -e 's|/var/run|/run|' ${D}/${systemd_system_unitdir}/slapd.service
install -m 644 ${WORKDIR}/${DSTSUFX0}/files/slapd.sysconfig ${D}/${sysconfdir}/sysconfig/slapd install -m 644 ${STX_METADATA_PATH}/files/slapd.sysconfig ${D}/${sysconfdir}/sysconfig/slapd
} }