phosphor-mapper: switch to c++ mapper
This patchset includes the set of patches required to build and use
the c++ version of the mapper.
(From meta-phosphor rev: 940ede4c9ababd85d5b766c3758439a00bb922b2)
Change-Id: I5c8114806b5a87f5b217fc6a78323355304213c9
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index 8787c6e..5e34814 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -6,15 +6,15 @@
[Service]
Restart=always
Type=dbus
-ExecStart=/usr/bin/env phosphor-mapper \
- --service_namespaces="${{MAPPER_SERVICES}}" \
- --interface_namespaces="${{MAPPER_INTERFACES}}" \
- --service_blacklists="${{MAPPER_SERVICEBLACKLISTS}}"
+ExecStart=/usr/bin/env mapperx \
+ --service-namespaces="${{MAPPER_SERVICES}}" \
+ --interface-namespaces="${{MAPPER_INTERFACES}}" \
+ --service-blacklists="${{MAPPER_SERVICEBLACKLISTS}}"
SyslogIdentifier=phosphor-mapper
BusName={BUSNAME}
TimeoutStartSec=300
+RestartSec=5
EnvironmentFile={envfiledir}/obmc/mapper
-Environment="PYTHONUNBUFFERED=1"
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}