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

[akuster808]

On 11/16/2016 07:58 PM, Denys Dmytriyenko wrote:
> On Mon, Nov 14, 2016 at 02:09:40PM -0500, Denys Dmytriyenko wrote:
>> On Thu, Nov 03, 2016 at 08:20:53AM -0700, akuster808 wrote:
>>>
>>> On 10/27/2016 10:02 AM, Denys Dmytriyenko 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>
>>> merged to staging.
>> Armin,
>>
>> Any updates on this? Also, I don't see it in krogoth-next - what staging you
>> are referring to?
> Ping again, this time copy Armin directly.
oops, Had it sitting on my system forgot to push to contrib. Pull 
request sent.

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