mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

tracker: Do not use hardcoded paths in systemd service files

Browse Source 
- 'sed' base_bindir and libexecdir in service files to align these
with a particular distro
- Fix whitespaces

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Shakeel, Muhammad
2013-09-06 11:52:58 +00:00
committed by Martin Jansa
parent c5ae85fec7
commit 19a61e1f0c
5 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/tracker/files/tracker-dbus.service
+1 -1
View File
@@ -8,7 +8,7 @@ BindTo=tracker-store.service
[Service] [Service]
Type=forking Type=forking
EnvironmentFile=-/tmp/tracker.env 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' ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env'
[Install] [Install]
meta-oe/recipes-support/tracker/files/tracker-miner-fs.service
+1 -1
View File
@@ -6,7 +6,7 @@ Requires=tracker-store.service
[Service] [Service]
Environment=HOME=/home/root Environment=HOME=/home/root
EnvironmentFile=-/tmp/tracker.env EnvironmentFile=-/tmp/tracker.env
ExecStart=/usr/libexec/tracker-miner-fs ExecStart=@LIBEXECDIR@/tracker-miner-fs
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
meta-oe/recipes-support/tracker/files/tracker-store.service
+1 -1
View File
@@ -6,7 +6,7 @@ BindTo=tracker-dbus.service
[Service] [Service]
EnvironmentFile=-/tmp/tracker.env EnvironmentFile=-/tmp/tracker.env
ExecStart=/usr/libexec/tracker-store ExecStart=@LIBEXECDIR@/tracker-store
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
meta-oe/recipes-support/tracker/tracker_0.14.2.bb
+6 -3
View File
@@ -32,14 +32,17 @@ EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \
LEAD_SONAME = "libtrackerclient.so.0" LEAD_SONAME = "libtrackerclient.so.0"
do_install_append() { do_install_append() {
cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true
# install -d ${D}/${sysconfdir}/X11/Xsession.d/ # install -d ${D}/${sysconfdir}/X11/Xsession.d/
# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ # install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/
install -d ${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-store.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/tracker-miner-fs.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 -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" PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej
+36
View File
@@ -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,@LIBEXECDIR@,${libexecdir},g' \
+ -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ ${D}${systemd_unitdir}/system/*.service
}
PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"