From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 98AA271AEF for ; Wed, 7 Dec 2016 17:40:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 015A720A48; Wed, 7 Dec 2016 17:40:17 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8Q1E9kry0xV7; Wed, 7 Dec 2016 17:40:16 +0000 (UTC) Received: from mail.denix.org (pool-100-15-95-79.washdc.fios.verizon.net [100.15.95.79]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D873D2017D; Wed, 7 Dec 2016 17:40:15 +0000 (UTC) Received: by mail.denix.org (Postfix, from userid 1000) id 72B801621C6; Wed, 7 Dec 2016 12:40:15 -0500 (EST) Date: Wed, 7 Dec 2016 12:40:15 -0500 From: Denys Dmytriyenko To: akuster808 Message-ID: <20161207174015.GC30576@denix.org> References: <1477587755-24666-1-git-send-email-denis@denix.org> <271f87f6-ac90-2389-3499-9c3bb8d80fa6@gmail.com> <20161114190940.GB22657@denix.org> <20161117035859.GB26131@denix.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: openembedded-devel@lists.openembedded.org Subject: Re: [meta-oe][krogoth][PATCH] syslog-ng: expand service file @variables@ earlier X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2016 17:40:15 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > >>>> > >>>>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 > >>>>Signed-off-by: Denys Dmytriyenko > >>>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 >