[oe-commits] [meta-openembedded] 01/03: syslog-ng: expand service file @variables@ earlier

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit 5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93
Author: Ian Ray <ian.ray at ge.com>
AuthorDate: Mon May 30 13:59:28 2016 +0300

    syslog-ng: expand service file @variables@ earlier
    
    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 at ge.com>
    Signed-off-by: Denys Dmytriyenko <denys at ti.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 4e0f697..898e9c2 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -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)}"
 }
 
+do_install_prepend() {
+    sed -i -e 's, at SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
+    sed -i -e 's, at LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
+    sed -i -e 's, at BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service
+}
+
 do_install_append() {
     install -d ${D}/${sysconfdir}/${BPN}
     install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${BPN}/${BPN}.conf
@@ -70,9 +76,6 @@ do_install_append() {
     install -d ${D}/${localstatedir}/lib/${BPN}
     # Remove /var/run as it is created on startup
     rm -rf ${D}${localstatedir}/run
-    sed -i -e 's, at SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
-    sed -i -e 's, at LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
-    sed -i -e 's, at BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service
 }
 
 FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.