summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2018-09-19 15:20:31 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-29 14:13:30 -0500
commit5c5cac354b5dd32cb3447a1dbeaf63358ad716ba (patch)
treeab280dba357a4c76b6dbcfde814397e563b57937 /meta-phosphor
parent1f8c376caf0b009395641825a9bf1b20a55629e6 (diff)
downloadtalos-openbmc-5c5cac354b5dd32cb3447a1dbeaf63358ad716ba.tar.gz
talos-openbmc-5c5cac354b5dd32cb3447a1dbeaf63358ad716ba.zip
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>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service10
1 files changed, 5 insertions, 5 deletions
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 8787c6ee7..5e348142a 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 @@ After=dbus.service
[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}
OpenPOWER on IntegriCloud