Media Hub

Merge lp:~phablet-team/media-hub/systemd-dbus-activation into lp:media-hub

  1. systemd-dbus-activation
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Approved
Approved by: Alfonso Sanchez-Beato
Approved revision: 214
Proposed branch: lp:~phablet-team/media-hub/systemd-dbus-activation
Merge into: lp:media-hub
Diff against target: 66 lines (+33/-0)
5 files modified
debian/media-hub.install (+2/-0)
src/core/media/CMakeLists.txt (+1/-0)
src/core/media/server/CMakeLists.txt (+19/-0)
src/core/media/server/core.ubuntu.media.Service.service (+4/-0)
src/core/media/server/media-hub.service (+7/-0)
To merge this branch: bzr merge lp:~phablet-team/media-hub/systemd-dbus-activation
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Scott Sweeny (community) Approve
Review via email: mp+310362@code.launchpad.net

Commit message

Add systemd dbus activation to media-hub.

Description of the change

Add systemd dbus activation to media-hub.

To post a comment you must log in.
Revision history for this message
Scott Sweeny (ssweeny) wrote :

LGTM

review: Approve
Reply
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve
Reply

Unmerged revisions

214. By Jim Hodapp

Make sure core.ubuntu.media.Service.service gets installed from the Debian package

213. By Jim Hodapp

Make sure to install a d-bus activation service file

212. By Jim Hodapp

Add systemd dbus activation to media-hub

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/media-hub.install'
2--- debian/media-hub.install 2014-04-16 19:56:03 +0000
3+++ debian/media-hub.install 2016-11-09 19:46:15 +0000
4@@ -1,3 +1,5 @@
5 debian/media-hub.conf /usr/share/upstart/sessions/
6+usr/share/dbus-1
7+usr/lib/systemd/user
8 debian/usr.bin.media-hub-server etc/apparmor.d
9 usr/bin
10
11=== modified file 'src/core/media/CMakeLists.txt'
12--- src/core/media/CMakeLists.txt 2016-08-12 16:08:16 +0000
13+++ src/core/media/CMakeLists.txt 2016-11-09 19:46:15 +0000
14@@ -12,6 +12,7 @@
15
16 message(STATUS ${MEDIA_HUB_HEADERS})
17
18+add_subdirectory(server)
19 add_subdirectory(telephony)
20
21 add_library(
22
23=== added file 'src/core/media/server/CMakeLists.txt'
24--- src/core/media/server/CMakeLists.txt 1970-01-01 00:00:00 +0000
25+++ src/core/media/server/CMakeLists.txt 2016-11-09 19:46:15 +0000
26@@ -0,0 +1,19 @@
27+install(
28+ FILES core.ubuntu.media.Service.service
29+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
30+)
31+
32+###########################
33+# Systemd Unit File
34+###########################
35+
36+# Where to install
37+# Uncomment when we drop Vivid
38+# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
39+set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
40+message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
41+
42+install(
43+ FILES media-hub.service
44+ DESTINATION ${SYSTEMD_USER_DIR}/
45+)
46
47=== added file 'src/core/media/server/core.ubuntu.media.Service.service'
48--- src/core/media/server/core.ubuntu.media.Service.service 1970-01-01 00:00:00 +0000
49+++ src/core/media/server/core.ubuntu.media.Service.service 2016-11-09 19:46:15 +0000
50@@ -0,0 +1,4 @@
51+[D-BUS Service]
52+Name=core.ubuntu.media.Service
53+Exec=/usr/bin/media-hub-server
54+SystemdService=media-hub.service
55
56=== added file 'src/core/media/server/media-hub.service'
57--- src/core/media/server/media-hub.service 1970-01-01 00:00:00 +0000
58+++ src/core/media/server/media-hub.service 2016-11-09 19:46:15 +0000
59@@ -0,0 +1,7 @@
60+[Unit]
61+Description=Media Hub Service - centrally manages all media stream playback
62+
63+[Service]
64+Type=dbus
65+BusName=core.ubuntu.media.Service
66+ExecStart=/usr/bin/media-hub-server

Subscribers

People subscribed via source and target branches

to all changes: