diff options
| author |   Ian Ray <ian.ray@ge.com> | 2016-05-30 13:59:28 +0300 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-08 14:55:28 +0200 |
| commit | 4594d24bc082d326993e7fd545ca4ac722749953 (patch) | |
| tree | 1944d22969e9be8c458d7f1639c152b137e0397e /meta-oe/recipes-support/syslog-ng | |
| parent | b27938bc7ac6ab9eb2c31db15ec787c7b4a5a55d (diff) | |
| download | meta-openembedded-contrib-4594d24bc082d326993e7fd545ca4ac722749953.tar.gz | |
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@ge.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng')
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 9 |
1 files 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 4e0f697bce..898e9c2a35 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,@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() { 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,@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" |