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
=== modified file 'debian/media-hub.install'
--- debian/media-hub.install 2014-04-16 19:56:03 +0000
+++ debian/media-hub.install 2016-11-09 19:46:15 +0000
@@ -1,3 +1,5 @@
1debian/media-hub.conf /usr/share/upstart/sessions/1debian/media-hub.conf /usr/share/upstart/sessions/
2usr/share/dbus-1
3usr/lib/systemd/user
2debian/usr.bin.media-hub-server etc/apparmor.d4debian/usr.bin.media-hub-server etc/apparmor.d
3usr/bin5usr/bin
46
=== modified file 'src/core/media/CMakeLists.txt'
--- src/core/media/CMakeLists.txt 2016-08-12 16:08:16 +0000
+++ src/core/media/CMakeLists.txt 2016-11-09 19:46:15 +0000
@@ -12,6 +12,7 @@
1212
13message(STATUS ${MEDIA_HUB_HEADERS})13message(STATUS ${MEDIA_HUB_HEADERS})
1414
15add_subdirectory(server)
15add_subdirectory(telephony)16add_subdirectory(telephony)
1617
17add_library(18add_library(
1819
=== added file 'src/core/media/server/CMakeLists.txt'
--- src/core/media/server/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/core/media/server/CMakeLists.txt 2016-11-09 19:46:15 +0000
@@ -0,0 +1,19 @@
1install(
2 FILES core.ubuntu.media.Service.service
3 DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
4)
5
6###########################
7# Systemd Unit File
8###########################
9
10# Where to install
11# Uncomment when we drop Vivid
12# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
13set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
14message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
15
16install(
17 FILES media-hub.service
18 DESTINATION ${SYSTEMD_USER_DIR}/
19)
020
=== added file 'src/core/media/server/core.ubuntu.media.Service.service'
--- src/core/media/server/core.ubuntu.media.Service.service 1970-01-01 00:00:00 +0000
+++ src/core/media/server/core.ubuntu.media.Service.service 2016-11-09 19:46:15 +0000
@@ -0,0 +1,4 @@
1[D-BUS Service]
2Name=core.ubuntu.media.Service
3Exec=/usr/bin/media-hub-server
4SystemdService=media-hub.service
05
=== added file 'src/core/media/server/media-hub.service'
--- src/core/media/server/media-hub.service 1970-01-01 00:00:00 +0000
+++ src/core/media/server/media-hub.service 2016-11-09 19:46:15 +0000
@@ -0,0 +1,7 @@
1[Unit]
2Description=Media Hub Service - centrally manages all media stream playback
3
4[Service]
5Type=dbus
6BusName=core.ubuntu.media.Service
7ExecStart=/usr/bin/media-hub-server

Subscribers

People subscribed via source and target branches

to all changes: