mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

syslog-ng: expand service file @variables@ earlier

Browse Source 
Move variable expansion of @SBINDIR@, @LOCALSTATEDIR@, and @BASEBINDIR@
earlier during install, to before the systemd service file is installed
by an automake rule.

Signed-off-by: Ian Ray <ian.ray@ge.com>
This commit is contained in:
Ian Ray
2016-05-30 13:59:28 +03:00
committed by Martin Jansa
parent b27938bc7a
commit 4594d24bc0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+6 -3
View File
@@ -60,6 +60,12 @@ do_configure_prepend() {
eval "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" eval "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}"
} }
do_install_prepend() {
sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service
}
do_install_append() { do_install_append() {
install -d ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/${BPN}
install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${BPN}/${BPN}.conf install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${BPN}/${BPN}.conf
@@ -70,9 +76,6 @@ do_install_append() {
install -d ${D}/${localstatedir}/lib/${BPN} install -d ${D}/${localstatedir}/lib/${BPN}
# Remove /var/run as it is created on startup # Remove /var/run as it is created on startup
rm -rf ${D}${localstatedir}/run rm -rf ${D}${localstatedir}/run
sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service
} }
FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"