Return-Path: Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 0E8D16FFCE for ; Thu, 27 Oct 2016 17:02:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 7750E20863; Thu, 27 Oct 2016 17:02:38 +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 mF82ydQRmDRr; Thu, 27 Oct 2016 17:02:38 +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 4DE9F201FD; Thu, 27 Oct 2016 17:02:36 +0000 (UTC) Received: from sam.denix (sam [192.168.0.5]) by gandalf.denix.org (Postfix) with ESMTP id 82C43162173; Thu, 27 Oct 2016 13:02:35 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-devel@lists.openembedded.org Date: Thu, 27 Oct 2016 13:02:35 -0400 Message-Id: <1477587755-24666-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Ian Ray , Denys Dmytriyenko Subject: [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 17:02:39 -0000 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 +} + 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