[oe-commits] Shakeel, Muhammad : tracker: Do not use hardcoded paths in systemd service files
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 17 17:09:43 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: 19a61e1f0cbe9e59b7de9f36106a2f9e32f880fa
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=19a61e1f0cbe9e59b7de9f36106a2f9e32f880fa
Author: Shakeel, Muhammad <muhammad_shakeel at mentor.com>
Date: Fri Sep 6 11:52:58 2013 +0000
tracker: Do not use hardcoded paths in systemd service files
- 'sed' base_bindir and libexecdir in service files to align these
with a particular distro
- Fix whitespaces
Signed-off-by: Muhammad Shakeel <muhammad_shakeel at mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../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 | 9 +++--
.../recipes-support/tracker/tracker_0.14.2.bb.rej | 36 ++++++++++++++++++++
5 files changed, 45 insertions(+), 6 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..fc6db4b 100644
--- a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb
+++ b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb
@@ -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
+ sed -i -e 's, at LIBEXECDIR@,${libexecdir},g' \
+ -e 's, at BASE_BINDIR@,${base_bindir},g' \
+ ${D}${systemd_unitdir}/system/*.service
}
PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej
new file mode 100644
index 0000000..d044829
--- /dev/null
+++ b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej
@@ -0,0 +1,36 @@
+--- meta-oe/recipes-support/tracker/tracker_0.14.2.bb
++++ meta-oe/recipes-support/tracker/tracker_0.14.2.bb
+@@ -13,7 +13,7 @@
+ 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 @@
+ 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, at LIBEXECDIR@,${libexecdir},g' \
++ -e 's, at BASE_BINDIR@,${base_bindir},g' \
++ ${D}${systemd_unitdir}/system/*.service
+ }
+
+ PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
More information about the Openembedded-commits
mailing list