summaryrefslogtreecommitdiff
path: root/meta-phosphor/common
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-07-14 02:10:19 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2016-07-28 21:35:37 +0300
commit502545dab3456e51a32892f4d92b2cab96310d4b (patch)
tree1fee4e0bc9af8d065fd1f7f040317888b4f18bac /meta-phosphor/common
parent01341984c024db0564fbd86bc8d0823a5a3a749c (diff)
downloadopenbmc-502545dab3456e51a32892f4d92b2cab96310d4b.tar.xz
classes-dbus: Instantiate obmc-phosphor-systemd
Instantiate obmc-phosphor-systemd and translate SYSTEMD_% variables appropriately. This enables systemd unit files that adhere to the standard naming convention: <dbus service name>.service to be found via DBUS_SERVICE_${PN} and inherit the functionality of the obmc-phosphor-systemd class. Add DBUS_USER_%s_%s and translate to SYSTEMD_USER_%s_%s appropriately. Change-Id: I14f2f6eac60add478c1793da29ba15518dcd958e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r--meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service (renamed from meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service)0
-rw-r--r--meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service4
-rw-r--r--meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service (renamed from meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service)0
-rw-r--r--meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service (renamed from meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service)0
-rw-r--r--meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service4
5 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
index ff863ea0db..ff863ea0db 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
index 8612b9899f..4defe5e968 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
@@ -1,7 +1,7 @@
[Unit]
Description=Phosphor OpenBMC DBus REST daemon
-Requires=obmc-mapper.service
-After=obmc-mapper.service
+Requires=org.openbmc.ObjectMapper.service
+After=org.openbmc.ObjectMapper.service
[Service]
Restart=always
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service
index 27d9bfe129..27d9bfe129 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service
index 442e910fba..442e910fba 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service
index 9cb04cf4c7..076a60a9a7 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenBMC system manager
-Requires=obmc-mapper.service
-After=obmc-mapper.service
+Requires=org.openbmc.ObjectMapper.service
+After=org.openbmc.ObjectMapper.service
[Service]
Restart=always