diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-04-15 07:16:45 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-04-16 01:24:57 +0300 |
| commit | 02dfe9e2d73f31f1403d32b49629c580f6b52aa3 (patch) | |
| tree | 12172b38d1678d24f2cfa625da5cf9470b941830 /meta-ampere/meta-jade/recipes-phosphor | |
| parent | 8b96ab5f4f48898c241dad276b115fe623b44cf0 (diff) | |
| download | openbmc-02dfe9e2d73f31f1403d32b49629c580f6b52aa3.tar.xz | |
meta-ampere: ssifbridge: use drop-in to switch bmc-ok
Instead of overwriting ssifbridge.service to set bmc-ok, use systemd
drop-in units instead.
Tested:
1. Stop ssifbridge.service service, check if bmc-ok is 0.
2. Start ssifbridge.service service, check if bmc-ok is 1.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I36e065ed84c4c8aa154996d9a31cfc21d0ab5657
Diffstat (limited to 'meta-ampere/meta-jade/recipes-phosphor')
3 files changed, 9 insertions, 21 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge-override.conf b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge-override.conf new file mode 100644 index 0000000000..fd7a392362 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge-override.conf @@ -0,0 +1,3 @@ +[Service] +ExecStopPost=/bin/sh -c "/usr/bin/gpioset 0 228=0" +ExecStartPost=/bin/sh -c "/usr/bin/gpioset 0 228=1" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge.service b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge.service deleted file mode 100644 index 71232abf34..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif/ssifbridge.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Phosphor IPMI SSIF DBus Bridge -StartLimitBurst=3 -StartLimitIntervalSec=300 -After=phosphor-ipmi-host.service - -[Service] -Restart=always -RestartSec=10 -TimeoutStartSec=60 -TimeoutStopSec=60 -ExecStart=/usr/bin/ssifbridged -ExecStopPost=/bin/sh -c "/usr/bin/gpioset 0 228=0" -ExecStartPost=/bin/sh -c "/usr/bin/gpioset 0 228=1" -SyslogIdentifier=ssifbridged - -[Install] -WantedBy=multi-user.target -RequiredBy= diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif_%.bbappend index d08dfd2d2d..e03cc21fb7 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-ssif_%.bbappend @@ -1,7 +1,11 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -SRC_URI += " file://ssifbridge.service" +SRC_URI += " file://ssifbridge-override.conf" + +FILES:${PN} += "${systemd_system_unitdir}/ssifbridge.service.d" do_install:append() { - cp ${WORKDIR}/ssifbridge.service ${D}${systemd_system_unitdir}/ssifbridge.service + install -d ${D}${systemd_system_unitdir}/ssifbridge.service.d + install -m 644 ${WORKDIR}/ssifbridge-override.conf \ + ${D}${systemd_system_unitdir}/ssifbridge.service.d } |