Commit 5c3d8fed authored by Hannu Mallat's avatar Hannu Mallat

[connectionagent] Boost D-Bus activation

Boost D-Bus activation; also, move tracing under /var/lib/environment
so that ut's easier to use it for the D-Bus activated connectionagent.
parent 26ff1469
[D-BUS Service]
Name=com.jolla.Connectiond
Exec=/usr/bin/connectionagent
ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $CONNECTIONAGENT_TRACING
SystemdService=connectionagent.service
Interface=/Connectiond
......@@ -3,7 +3,8 @@ TEMPLATE = subdirs
OTHER_FILES += \
com.jolla.Connectiond.service \
connectionagent.conf \
connectionagent.service
connectionagent.service \
70-connectionagent-tracing.conf
dbusservice.path = $${INSTALL_PREFIX}/usr/share/dbus-1/services
dbusservice.files = com.jolla.Connectiond.service
......@@ -14,4 +15,7 @@ systemdservice.files = connectionagent.service
dbusconfig.path = /etc/dbus-1/session.d
dbusconfig.files = connectionagent.conf
INSTALLS += dbusservice systemdservice dbusconfig
nemoenvironment.path = $${INSTALL_PREFIX}/var/lib/environment/nemo
nemoenvironment.files = 70-connectionagent-tracing.conf
INSTALLS += dbusservice systemdservice dbusconfig nemoenvironment
......@@ -4,8 +4,7 @@ Requires=dbus.service booster-qt5.service
After=pre-user-session.target booster-qt5.service
[Service]
EnvironmentFile=-/etc/tracing/connectionagent/connectionagent.tracing
ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $TRACING
ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $CONNECTIONAGENT_TRACING
Type=dbus
BusName=com.jolla.Connectiond
Restart=always
......
......@@ -7,7 +7,6 @@ Group: Communications/Connectivity Adaptation
License: LGPLv2
URL: http://github.com/lpotter/connectionagent
Source0: %{name}-%{version}.tar.bz2
Source1: connectionagent.tracing
Requires: connman-qt5-declarative
Requires: systemd
Requires: systemd-user-session-targets
......@@ -69,8 +68,6 @@ rm -rf %{buildroot}
%qmake5_install
%make_install
mkdir -p %{buildroot}%{_sysconfdir}/tracing/connectionagent/
cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/tracing/connectionagent/
mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
ln -s ../connectionagent.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
......@@ -105,4 +102,4 @@ fi
%files tracing
%defattr(-,root,root,-)
%config %{_sysconfdir}/tracing/connectionagent
%config /var/lib/environment/nemo/70-connectionagent-tracing.conf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment