* [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier @ 2016-10-27 17:02 Denys Dmytriyenko 2016-10-27 19:55 ` Khem Raj 2016-11-03 15:20 ` akuster808 0 siblings, 2 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2016-10-27 17:02 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray, Denys Dmytriyenko From: Ian Ray <ian.ray@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@ge.com> Signed-off-by: Denys Dmytriyenko <denys@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,@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" -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-10-27 17:02 [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier Denys Dmytriyenko @ 2016-10-27 19:55 ` Khem Raj 2016-10-27 20:04 ` Denys Dmytriyenko 2016-11-03 15:20 ` akuster808 1 sibling, 1 reply; 11+ messages in thread From: Khem Raj @ 2016-10-27 19:55 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray, Denys Dmytriyenko [-- Attachment #1: Type: text/plain, Size: 2351 bytes --] > On Oct 27, 2016, at 10:02 AM, Denys Dmytriyenko <denis@denix.org> wrote: > > From: Ian Ray <ian.ray@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@ge.com> > Signed-off-by: Denys Dmytriyenko <denys@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,@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 > +} 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,@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" > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-10-27 19:55 ` Khem Raj @ 2016-10-27 20:04 ` Denys Dmytriyenko 2016-10-28 1:27 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2016-10-27 20:04 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray On Thu, Oct 27, 2016 at 12:55:33PM -0700, Khem Raj wrote: > > > On Oct 27, 2016, at 10:02 AM, Denys Dmytriyenko <denis@denix.org> wrote: > > > > From: Ian Ray <ian.ray@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@ge.com> > > Signed-off-by: Denys Dmytriyenko <denys@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,@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 > > +} > > 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. That would probably be a better solution... for master. This is just a mere backport of the commit already in master. > > 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" > > -- > > 2.7.4 > > > > -- > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-10-27 20:04 ` Denys Dmytriyenko @ 2016-10-28 1:27 ` Khem Raj 0 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2016-10-28 1:27 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray [-- Attachment #1: Type: text/plain, Size: 1846 bytes --] > On Oct 27, 2016, at 1:04 PM, Denys Dmytriyenko <denis@denix.org> wrote: > > On Thu, Oct 27, 2016 at 12:55:33PM -0700, Khem Raj wrote: >> >>> On Oct 27, 2016, at 10:02 AM, Denys Dmytriyenko <denis@denix.org> wrote: >>> >>> From: Ian Ray <ian.ray@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@ge.com> >>> Signed-off-by: Denys Dmytriyenko <denys@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,@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 >>> +} >> >> 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. > > That would probably be a better solution... for master. This is just a mere > backport of the commit already in master. I guess then we need to do it once again via master. [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-10-27 17:02 [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier Denys Dmytriyenko 2016-10-27 19:55 ` Khem Raj @ 2016-11-03 15:20 ` akuster808 2016-11-14 19:09 ` Denys Dmytriyenko 1 sibling, 1 reply; 11+ messages in thread From: akuster808 @ 2016-11-03 15:20 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray, Denys Dmytriyenko On 10/27/2016 10:02 AM, Denys Dmytriyenko wrote: > From: Ian Ray <ian.ray@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@ge.com> > Signed-off-by: Denys Dmytriyenko <denys@ti.com> merged to staging. -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,@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" > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-11-03 15:20 ` akuster808 @ 2016-11-14 19:09 ` Denys Dmytriyenko 2016-11-17 3:58 ` Denys Dmytriyenko 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2016-11-14 19:09 UTC (permalink / raw) To: openembedded-devel; +Cc: Ian Ray 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@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@ge.com> > > Signed-off-by: Denys Dmytriyenko <denys@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? -- Denys > > 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,@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" > > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-11-14 19:09 ` Denys Dmytriyenko @ 2016-11-17 3:58 ` Denys Dmytriyenko 2016-11-18 15:25 ` akuster808 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2016-11-17 3:58 UTC (permalink / raw) To: openembedded-devel 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@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@ge.com> > > > Signed-off-by: Denys Dmytriyenko <denys@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. > > > 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,@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" > > > > > -- > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-11-17 3:58 ` Denys Dmytriyenko @ 2016-11-18 15:25 ` akuster808 2016-12-07 17:40 ` Denys Dmytriyenko 0 siblings, 1 reply; 11+ messages in thread From: akuster808 @ 2016-11-18 15:25 UTC (permalink / raw) To: Denys Dmytriyenko, openembedded-devel 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@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@ge.com> >>>> Signed-off-by: Denys Dmytriyenko <denys@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,@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" >>>> >>> -- >>> _______________________________________________ >>> Openembedded-devel mailing list >>> Openembedded-devel@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-11-18 15:25 ` akuster808 @ 2016-12-07 17:40 ` Denys Dmytriyenko 2016-12-13 3:55 ` akuster808 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2016-12-07 17:40 UTC (permalink / raw) To: akuster808; +Cc: openembedded-devel On Fri, Nov 18, 2016 at 07:25:48AM -0800, akuster808 wrote: > > > 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@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@ge.com> > >>>>Signed-off-by: Denys Dmytriyenko <denys@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, Thanks, this hasn't been merged yet, it appears... Any ETA? -- Denys > >>>> 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,@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" > >>>> > >>>-- > >>>_______________________________________________ > >>>Openembedded-devel mailing list > >>>Openembedded-devel@lists.openembedded.org > >>>http://lists.openembedded.org/mailman/listinfo/openembedded-devel > >>-- > >>_______________________________________________ > >>Openembedded-devel mailing list > >>Openembedded-devel@lists.openembedded.org > >>http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-12-07 17:40 ` Denys Dmytriyenko @ 2016-12-13 3:55 ` akuster808 2016-12-14 2:25 ` Denys Dmytriyenko 0 siblings, 1 reply; 11+ messages in thread From: akuster808 @ 2016-12-13 3:55 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: openembedded-devel Denys, On 12/07/2016 09:40 AM, Denys Dmytriyenko wrote: > On Fri, Nov 18, 2016 at 07:25:48AM -0800, akuster808 wrote: >> >> 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@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@ge.com> >>>>>> Signed-off-by: Denys Dmytriyenko <denys@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, > > Thanks, this hasn't been merged yet, it appears... Any ETA? is this the commit you are looking for? http://cgit.openembedded.org/meta-openembedded/commit/?h=krogoth&id=5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93 - armin > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier 2016-12-13 3:55 ` akuster808 @ 2016-12-14 2:25 ` Denys Dmytriyenko 0 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2016-12-14 2:25 UTC (permalink / raw) To: akuster808; +Cc: openembedded-devel On Mon, Dec 12, 2016 at 07:55:40PM -0800, akuster808 wrote: > Denys, > > > > On 12/07/2016 09:40 AM, Denys Dmytriyenko wrote: > >On Fri, Nov 18, 2016 at 07:25:48AM -0800, akuster808 wrote: > >> > >>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@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@ge.com> > >>>>>>Signed-off-by: Denys Dmytriyenko <denys@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, > > > >Thanks, this hasn't been merged yet, it appears... Any ETA? > > is this the commit you are looking for? > http://cgit.openembedded.org/meta-openembedded/commit/?h=krogoth&id=5882ba7f378acc75385e8a3ab00a6bdbc7a0ef93 Yeah, I saw it merged few days ago, thanks! -- Denys ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-12-14 2:25 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-10-27 17:02 [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier Denys Dmytriyenko 2016-10-27 19:55 ` Khem Raj 2016-10-27 20:04 ` Denys Dmytriyenko 2016-10-28 1:27 ` Khem Raj 2016-11-03 15:20 ` akuster808 2016-11-14 19:09 ` Denys Dmytriyenko 2016-11-17 3:58 ` Denys Dmytriyenko 2016-11-18 15:25 ` akuster808 2016-12-07 17:40 ` Denys Dmytriyenko 2016-12-13 3:55 ` akuster808 2016-12-14 2:25 ` Denys Dmytriyenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox