aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Ray <ian.ray@ge.com>2016-05-30 13:59:28 +0300
committerArmin Kuster <akuster808@gmail.com>2016-11-03 08:15:57 -0700
commit5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93 (patch)
tree74f137f88c69484f0dcb771872ff6c6bd5e5f2a5
parent851a064b53dca3b14dd33eaaaca9573b1a36bf0e (diff)
downloadmeta-openembedded-contrib-5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93.tar.gz
meta-openembedded-contrib-5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93.tar.bz2
meta-openembedded-contrib-5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93.zip
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> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc9
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"