[oe] [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier

[Khem Raj]

> On Oct 27, 2016, at 10:02 AM, Denys Dmytriyenko <denis at denix.org> wrote:
> 
> From: Ian Ray <ian.ray at ge.com>
> 
> 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>
> ---
> 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
> +}

perhaps, its better to sed the installed artifacts in staging area under ${D}
it can be done during post install and then ${S} is not edited as it is doing
right now.

> +
> 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"
> --
> 2.7.4
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20161027/a305f25a/attachment-0002.sig>