| commit | c888e3f0e5cbd265ccbab0ba63e5e0735f5f13d3 | [log] [tgz] |
|---|---|---|
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | Mon Jul 03 16:44:17 2023 +0700 |
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | Thu Jul 06 07:22:21 2023 +0000 |
| tree | fed5e3e8e2ef64c29bb3b8caa780d0ae4dd760ae | |
| parent | aeae6a79ae01e3b30908c92ad563fd047a33234b [diff] |
meta-ampere: gpio-monitor: move services to meta-common Move services that are used across Ampere platform to meta-ampere/meta-common to prevent duplicate codes. Tested: 1. Compile Mt.Jade and Mt.Mitchell without error. 2. From Host OS run 'reboot' command and check if the BMC handles correctly. 3. From Host OS run 'shutdown' command and check if the BMC handles correctly Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com> Change-Id: I678d9a19fea0a531ad59d54ea9386cb177af18c6
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service similarity index 100% rename from meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service rename to meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service similarity index 100% rename from meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service rename to meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service similarity index 100% rename from meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service rename to meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_overtemp@.service b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_overtemp@.service similarity index 100% rename from meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_overtemp@.service rename to meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_overtemp@.service
diff --git a/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend new file mode 100644 index 0000000..f8cf1d4 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SYSTEMD_SERVICE:${PN}-monitor += " \ + ampere-host-shutdown-ack@.service \ + ampere_overtemp@.service \ + ampere_hightemp_start@.service \ + ampere_hightemp_stop@.service \ + " + +SYSTEMD_LINK:${PN}-monitor:append = " ../phosphor-multi-gpio-monitor.service:multi-user.target.requires/phosphor-multi-gpio-monitor.service" +
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 9a5bab4..db903fa 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -13,10 +13,6 @@ " SYSTEMD_SERVICE:${PN}-monitor += " \ - ampere-host-shutdown-ack@.service \ - ampere_overtemp@.service \ - ampere_hightemp_start@.service \ - ampere_hightemp_stop@.service \ ampere_scp_failover.service \ psu_hotswap_reset@.service \ " @@ -27,8 +23,6 @@ /usr/sbin/ampere_psu_reset_hotswap.sh \ " -SYSTEMD_LINK:${PN}-monitor:append = " ../phosphor-multi-gpio-monitor.service:multi-user.target.requires/phosphor-multi-gpio-monitor.service" - do_install:append() { install -d ${D}${sbindir} install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json ${D}${datadir}/${PN}/
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 60661c1..5435b45 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -8,17 +8,12 @@ SYSTEMD_SERVICE:${PN}-monitor += " \ ampere-host-shutdown-ack@.service \ - ampere_overtemp@.service \ - ampere_hightemp_start@.service \ - ampere_hightemp_stop@.service \ " FILES:${PN}-monitor += " \ ${datadir}/${PN}/phosphor-multi-gpio-monitor.json \ " -SYSTEMD_LINK:${PN}-monitor:append = " ../phosphor-multi-gpio-monitor.service:multi-user.target.requires/phosphor-multi-gpio-monitor.service" - do_install:append() { install -d ${D}${bindir} install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json ${D}${datadir}/${PN}/