net-nds/openldap: sed init script and systemd unit before install

Bug: https://bugs.gentoo.org/625960
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1
This commit is contained in:
Mike Gilbert
2017-07-22 15:30:47 -04:00
parent a95c09c76a
commit 3d4a1abe1c
3 changed files with 15 additions and 21 deletions

View File

@@ -716,18 +716,16 @@ multilib_src_install() {
# install our own init scripts and systemd unit files
einfo "Install init scripts"
newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
doinitd "${T}"/slapd
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
einfo "Install systemd service"
systemd_dounit "${FILESDIR}"/slapd.service
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
systemd_dounit "${T}"/slapd.service
systemd_install_serviced "${FILESDIR}"/slapd.service.conf
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
if [[ $(get_libdir) != lib ]]; then
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
"${ED}"/etc/init.d/slapd \
"${ED}"/usr/lib/systemd/system/slapd.service || die
fi
# If built without SLP, we don't need to be before avahi
use slp \
|| sed -i \

View File

@@ -694,18 +694,16 @@ multilib_src_install() {
# install our own init scripts and systemd unit files
einfo "Install init scripts"
newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
doinitd "${T}"/slapd
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
einfo "Install systemd service"
systemd_dounit "${FILESDIR}"/slapd.service
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
systemd_dounit "${T}"/slapd.service
systemd_install_serviced "${FILESDIR}"/slapd.service.conf
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
if [[ $(get_libdir) != lib ]]; then
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
"${ED}"/etc/init.d/slapd \
"${ED}"/usr/lib/systemd/system/slapd.service || die
fi
# If built without SLP, we don't need to be before avahi
use slp \
|| sed -i \

View File

@@ -748,18 +748,16 @@ multilib_src_install() {
# install our own init scripts and systemd unit files
einfo "Install init scripts"
newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
doinitd "${T}"/slapd
newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
einfo "Install systemd service"
systemd_dounit "${FILESDIR}"/slapd.service
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
systemd_dounit "${T}"/slapd.service
systemd_install_serviced "${FILESDIR}"/slapd.service.conf
systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
if [[ $(get_libdir) != lib ]]; then
sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
"${ED}"/etc/init.d/slapd \
"${ED}"/usr/lib/systemd/system/slapd.service || die
fi
# If built without SLP, we don't need to be before avahi
use slp \
|| sed -i \