| commit | f90a17d454bec3b0930c25bf7e7301ad5e554bb7 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Jul 13 19:10:19 2016 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Jul 28 14:35:37 2016 -0400 |
| tree | d8f1493fe19eafaeee841f9897139db629a192ce | |
| parent | c8ab776df0d336a47e1d9a2344f85e4a51926113 [diff] |
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>
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service similarity index 100% rename from common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service rename to common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
diff --git a/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service b/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service index 8612b98..4defe5e 100644 --- a/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service +++ b/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/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service b/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service similarity index 100% rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service rename to common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service b/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service similarity index 100% rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service rename to common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service b/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service index 9cb04cf..076a60a 100644 --- a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/obmc-mgr-system.service +++ b/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