From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by mail.openembedded.org (Postfix) with ESMTP id BDCC76B991 for ; Thu, 26 Sep 2013 06:34:26 +0000 (UTC) Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1VP59g-0003zF-3e from Muhammad_Shakeel@mentor.com for openembedded-devel@lists.openembedded.org; Wed, 25 Sep 2013 23:34:28 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 25 Sep 2013 23:34:27 -0700 Received: from [137.202.157.119] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 26 Sep 2013 07:34:25 +0100 Message-ID: <5243D5CE.4070206@mentor.com> Date: Thu, 26 Sep 2013 11:35:58 +0500 From: Muhammad Shakeel User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: References: <1378468378-16789-1-git-send-email-muhammad_shakeel@mentor.com> In-Reply-To: <1378468378-16789-1-git-send-email-muhammad_shakeel@mentor.com> X-Originating-IP: [137.202.0.76] X-OriginalArrivalTime: 26 Sep 2013 06:34:27.0760 (UTC) FILETIME=[72F69300:01CEBA82] Subject: Re: [meta-oe][PATCH] tracker: Do not use hardcoded paths in systemd service files X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2013 06:34:27 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Greetings, Any feedback on this? Can this be merged before 1.5 is out? Thanks, Shakeel On 09/06/2013 04:52 PM, Muhammad Shakeel wrote: > - 'sed' base_bindir and libexecdir in service files to align these > with a particular distro > - Fix whitespaces > > Signed-off-by: Muhammad Shakeel > --- > .../tracker/files/tracker-dbus.service | 2 +- > .../tracker/files/tracker-miner-fs.service | 2 +- > .../tracker/files/tracker-store.service | 2 +- > meta-oe/recipes-support/tracker/tracker_0.14.2.bb | 19 +++++++++++-------- > 4 files changed, 14 insertions(+), 11 deletions(-) > > diff --git a/meta-oe/recipes-support/tracker/files/tracker-dbus.service b/meta-oe/recipes-support/tracker/files/tracker-dbus.service > index 9d4fb74..c97f49a 100644 > --- a/meta-oe/recipes-support/tracker/files/tracker-dbus.service > +++ b/meta-oe/recipes-support/tracker/files/tracker-dbus.service > @@ -8,7 +8,7 @@ BindTo=tracker-store.service > [Service] > Type=forking > EnvironmentFile=-/tmp/tracker.env > -ExecStartPre=/bin/rm -rf /tmp/tracker.env > +ExecStartPre=@BASE_BINDIR@/rm -rf /tmp/tracker.env > ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env' > > [Install] > diff --git a/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service b/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > index f143924..34d9a1e 100644 > --- a/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > +++ b/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > @@ -6,7 +6,7 @@ Requires=tracker-store.service > [Service] > Environment=HOME=/home/root > EnvironmentFile=-/tmp/tracker.env > -ExecStart=/usr/libexec/tracker-miner-fs > +ExecStart=@LIBEXECDIR@/tracker-miner-fs > > [Install] > WantedBy=multi-user.target > diff --git a/meta-oe/recipes-support/tracker/files/tracker-store.service b/meta-oe/recipes-support/tracker/files/tracker-store.service > index 7ca9ff0..c5037f3 100644 > --- a/meta-oe/recipes-support/tracker/files/tracker-store.service > +++ b/meta-oe/recipes-support/tracker/files/tracker-store.service > @@ -6,7 +6,7 @@ BindTo=tracker-dbus.service > > [Service] > EnvironmentFile=-/tmp/tracker.env > -ExecStart=/usr/libexec/tracker-store > +ExecStart=@LIBEXECDIR@/tracker-store > > [Install] > WantedBy=multi-user.target > diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb > index 5838c2d..d6febbf 100644 > --- a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb > +++ b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb > @@ -13,7 +13,7 @@ VER_DIR = "${@gnome_verdir("${PV}")}" > SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ > file://0005-Fix-missing-gobject-introspection-checks.patch \ > file://enable-sqlite-crosscompile.patch \ > - file://fix-removable-media-detection.patch \ > + file://fix-removable-media-detection.patch \ > file://90tracker \ > file://tracker-store.service \ > file://tracker-miner-fs.service \ > @@ -32,14 +32,17 @@ EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ > LEAD_SONAME = "libtrackerclient.so.0" > > do_install_append() { > - cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true > -# install -d ${D}/${sysconfdir}/X11/Xsession.d/ > -# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ > + cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true > + # install -d ${D}/${sysconfdir}/X11/Xsession.d/ > + # install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ > > - install -d ${D}${systemd_unitdir}/system > - install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system > - install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system > - install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system > + install -d ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system > + sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ > + -e 's,@BASE_BINDIR@,${base_bindir},g' \ > + ${D}${systemd_unitdir}/system/*.service > } > > PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"