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 D15A971A25 for ; Thu, 27 Oct 2016 20:04:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 6E79B20863; Thu, 27 Oct 2016 20:04:32 +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 c9FCKFUtrLAC; Thu, 27 Oct 2016 20:04:32 +0000 (UTC) Received: from gandalf.denix.org (pool-100-15-106-107.washdc.fios.verizon.net [100.15.106.107]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 4E25E2023B; Thu, 27 Oct 2016 20:04:31 +0000 (UTC) Received: by gandalf.denix.org (Postfix, from userid 1000) id BCE24162183; Thu, 27 Oct 2016 16:04:30 -0400 (EDT) Date: Thu, 27 Oct 2016 16:04:30 -0400 From: Denys Dmytriyenko To: openembedded-devel@lists.openembedded.org Message-ID: <20161027200430.GJ2494@denix.org> References: <1477587755-24666-1-git-send-email-denis@denix.org> <64B593B9-ABC1-4FAA-975D-144F46C7B134@gmail.com> MIME-Version: 1.0 In-Reply-To: <64B593B9-ABC1-4FAA-975D-144F46C7B134@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ian Ray 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: Thu, 27 Oct 2016 20:04:34 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Oct 27, 2016 at 12:55:33PM -0700, Khem Raj wrote: > > > On Oct 27, 2016, at 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 > > --- > > 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