meta-facebook: phosphor-gpio-monitor: deduplicate common files Move identical phosphor-gpio-monitor scripts and systemd services from platform-specific layers to the common meta-facebook layer, and consolidate platform-specific post-end services into a common implementation. Change-Id: I04b2d10066aa507de40be92febd50854cd5a7f08 Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end deleted file mode 100644 index 8c96ccd..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end +++ /dev/null
@@ -1,5 +0,0 @@ -#!/bin/bash - -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby - -exit 0
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service deleted file mode 100644 index 7c22069..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Assert Post Complete Status - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/assert-post-end - -SyslogIdentifier=assert-post-end
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end deleted file mode 100644 index b9e8a2e..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end +++ /dev/null
@@ -1,5 +0,0 @@ -#!/bin/bash - -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive - -exit 0
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service deleted file mode 100644 index 74eb955..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Deassert Post Complete Status - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/deassert-post-end - -SyslogIdentifier=deassert-post-end
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf deleted file mode 100644 index f70d5f5..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf +++ /dev/null
@@ -1,3 +0,0 @@ -[Unit] -Wants=multi-gpios-sys-init.service -After=multi-gpios-sys-init.service
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 19adcca..1fb8c89 100644 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -21,10 +21,8 @@ SERVICE_FILE_FMT = "file://{0}" SRC_URI += " \ - file://assert-post-end \ file://assert-power-good-drop \ file://bind-apml-driver \ - file://deassert-post-end \ file://deassert-power-good-drop \ file://multi-gpios-sys-init \ file://plat-phosphor-multi-gpio-monitor.json \ @@ -57,10 +55,8 @@ done install -d ${D}${libexecdir}/${PN} - install -m 0755 ${UNPACKDIR}/assert-post-end ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-power-good-drop ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/bind-apml-driver ${D}${libexecdir}/${PN}/ - install -m 0755 ${UNPACKDIR}/deassert-post-end ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-power-good-drop ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/multi-gpios-sys-init ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/power-rail-event-logger ${D}${libexecdir}/${PN}/
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end deleted file mode 100644 index b9e8a2e..0000000 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end +++ /dev/null
@@ -1,5 +0,0 @@ -#!/bin/bash - -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive - -exit 0
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service deleted file mode 100644 index 74eb955..0000000 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Deassert Post Complete Status - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/deassert-post-end - -SyslogIdentifier=deassert-post-end
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index b750de9..292c1c5 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -13,7 +13,6 @@ file://auto-poweroff@.service \ file://auto-poweron \ file://auto-poweron@.service \ - file://deassert-post-end \ file://deassert-post-end.service \ file://deassert-power-good \ file://deassert-power-good.service \ @@ -110,7 +109,6 @@ install -m 0755 ${UNPACKDIR}/deassert-reset-button ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-post-end ${D}${libexecdir}/${PN}/ - install -m 0755 ${UNPACKDIR}/deassert-post-end ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-power-good ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload deleted file mode 100644 index e2b3390..0000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload +++ /dev/null
@@ -1,6 +0,0 @@ -#!/bin/bash - -sleep 1 - -# Reload FAN PID service when fan board plug in. -systemctl reload phosphor-pid-control.service
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service deleted file mode 100644 index f68e6a5..0000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Reload Fan PID service when Deassertion - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/fan-reload - -SyslogIdentifier=fan-reload
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf deleted file mode 100644 index f70d5f5..0000000 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf +++ /dev/null
@@ -1,3 +0,0 @@ -[Unit] -Wants=multi-gpios-sys-init.service -After=multi-gpios-sys-init.service
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 619b5f7..091357d 100644 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -6,8 +6,6 @@ file://phosphor-multi-gpio-monitor.json \ file://reset_btn \ file://reset_btn@.service \ - file://assert-host-ready.service \ - file://deassert-host-ready.service \ file://assert-power-good-drop \ file://assert-power-good-drop.service \ file://deassert-power-good-drop \ @@ -36,8 +34,6 @@ SYSTEMD_SERVICE:${PN} += " \ reset_btn@.service \ - assert-host-ready.service \ - deassert-host-ready.service \ assert-power-good-drop.service \ deassert-power-good-drop.service \ thermal-assert-log@.service \
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end deleted file mode 100644 index 8c96ccd..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end +++ /dev/null
@@ -1,5 +0,0 @@ -#!/bin/bash - -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby - -exit 0
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service deleted file mode 100644 index 7c22069..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Assert Post Complete Status - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/assert-post-end - -SyslogIdentifier=assert-post-end
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end deleted file mode 100644 index b9e8a2e..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end +++ /dev/null
@@ -1,5 +0,0 @@ -#!/bin/bash - -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive - -exit 0
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service deleted file mode 100644 index 74eb955..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Deassert Post Complete Status - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/deassert-post-end - -SyslogIdentifier=deassert-post-end
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf deleted file mode 100644 index f70d5f5..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf +++ /dev/null
@@ -1,3 +0,0 @@ -[Unit] -Wants=multi-gpios-sys-init.service -After=multi-gpios-sys-init.service
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 47a05af..7983301 100644 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -34,13 +34,11 @@ SERVICE_FILE_FMT = "file://{0}" SRC_URI += " \ - file://assert-post-end \ file://assert-module-power-good \ file://assert-power-good-drop \ file://assert-reset-button \ file://assert-rmc-main-power-enable \ file://deassert-module-power-good \ - file://deassert-post-end \ file://deassert-power-good-drop \ file://deassert-reset-button \ file://deassert-rmc-main-power-enable \ @@ -80,12 +78,10 @@ install -d ${D}${libexecdir}/${PN} install -m 0755 ${UNPACKDIR}/assert-module-power-good ${D}${libexecdir}/${PN}/ - install -m 0755 ${UNPACKDIR}/assert-post-end ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-power-good-drop ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-reset-button ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/assert-rmc-main-power-enable ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-module-power-good ${D}${libexecdir}/${PN}/ - install -m 0755 ${UNPACKDIR}/deassert-post-end ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-power-good-drop ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-reset-button ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-rmc-main-power-enable ${D}${libexecdir}/${PN}/
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service deleted file mode 100644 index 85ded8e..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Assert Host Ready - -[Service] -Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby - -SyslogIdentifier=assert-host-ready
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service deleted file mode 100644 index 44ff136..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service +++ /dev/null
@@ -1,8 +0,0 @@ -[Unit] -Description=Deassert Host Ready - -[Service] -Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive - -SyslogIdentifier=deassert-host-ready
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json index 2e615a4..c588c97 100644 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json +++ b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json
@@ -34,8 +34,8 @@ "LineName": "FM_BIOS_POST_CMPLT_N", "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-host-ready.service"], - "FALLING": ["assert-host-ready.service"] + "RISING": ["deassert-post-end.service"], + "FALLING": ["assert-post-end.service"] }, "Continue": true },
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf deleted file mode 100644 index f70d5f5..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf +++ /dev/null
@@ -1,3 +0,0 @@ -[Unit] -Wants=multi-gpios-sys-init.service -After=multi-gpios-sys-init.service
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json index b6ddff3..1cb3c56 100644 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
@@ -34,8 +34,8 @@ "LineName": "FM_BIOS_POST_CMPLT_N", "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-host-ready.service"], - "FALLING": ["assert-host-ready.service"] + "RISING": ["deassert-post-end.service"], + "FALLING": ["assert-post-end.service"] }, "Continue": true },
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index af31dae..b40cf11 100644 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -8,8 +8,8 @@ file://reset_btn@.service \ file://multi-gpios-sys-init \ file://multi-gpios-sys-init.service \ - file://assert-host-ready.service \ - file://deassert-host-ready.service \ + file://assert-post-end.service \ + file://deassert-post-end.service \ file://assert-power-good-drop \ file://assert-power-good-drop.service \ file://deassert-power-good-drop \ @@ -47,8 +47,8 @@ SYSTEMD_SERVICE:${PN} += " \ reset_btn@.service \ multi-gpios-sys-init.service \ - assert-host-ready.service \ - deassert-host-ready.service \ + assert-post-end.service \ + deassert-post-end.service \ assert-power-good-drop.service \ deassert-power-good-drop.service \ gpio_bypass@.service \
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service similarity index 77% rename from meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service index 85ded8e..448172f 100644 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-host-ready.service +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-post-end.service
@@ -1,8 +1,8 @@ [Unit] -Description=Assert Host Ready +Description=Assert Post Complete Status [Service] Type=oneshot ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby -SyslogIdentifier=assert-host-ready +SyslogIdentifier=assert-post-end
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service similarity index 77% rename from meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service index 44ff136..d01b0b7 100644 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-host-ready.service +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-post-end.service
@@ -1,8 +1,8 @@ [Unit] -Description=Deassert Host Ready +Description=Deassert Post Complete Status [Service] Type=oneshot ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive -SyslogIdentifier=deassert-host-ready +SyslogIdentifier=deassert-post-end
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload similarity index 100% rename from meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service similarity index 100% rename from meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-reload.service
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf similarity index 100% rename from meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.conf