Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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.
  • Loading branch information
Hannu Mallat committed Oct 30, 2014
1 parent 26ff146 commit 5c3d8fe
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions config/70-connectionagent-tracing.conf
@@ -0,0 +1 @@
CONNECTIONAGENT_TRACING=-d
2 changes: 1 addition & 1 deletion config/com.jolla.Connectiond.service
@@ -1,5 +1,5 @@
[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
8 changes: 6 additions & 2 deletions config/config.pro
Expand Up @@ -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
Expand All @@ -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
3 changes: 1 addition & 2 deletions config/connectionagent.service
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions rpm/connectionagent-qt5.spec
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -105,4 +102,4 @@ fi

%files tracing
%defattr(-,root,root,-)
%config %{_sysconfdir}/tracing/connectionagent
%config /var/lib/environment/nemo/70-connectionagent-tracing.conf
1 change: 0 additions & 1 deletion rpm/connectionagent.tracing

This file was deleted.

0 comments on commit 5c3d8fe

Please sign in to comment.