commit f5d51d259d5ad05fdcd823ef5a54f7f888dd6597
author Adriana Kobylak <anoo@us.ibm.com> Thu Mar 25 16:34:23 2021 +0000
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Apr 01 12:12:55 2021 +0000
tree 9c93cfda9f1c8dde12b050884baeacd8851649b8
parent 1e598d9d3be242a205b758ebbad3846e18e13ad2

ibm: systemd: Replace rainier with p10bmc

The IBM rainier machine name is being replaced with the generic p10bmc.

Tested: Built a rainier image and verified the journal config files were
        present under:
rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/lib/systemd/

Change-Id: Ia5c1de23fdbf7b8aeed70bd450cb72254542eb41
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

meta-ibm/recipes-core/systemd/systemd_%.bbappend

diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend
index 500c91d..a6ef71d 100644
--- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend
@@ -3,24 +3,24 @@
 SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf"
 SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf"
 
-SRC_URI_append_rainier = " file://journald-storage-policy.conf"
-SRC_URI_append_rainier = " file://systemd-journald-override.conf"
-SRC_URI_append_rainier = " file://journald-size-policy.conf"
+SRC_URI_append_p10bmc = " file://journald-storage-policy.conf"
+SRC_URI_append_p10bmc = " file://systemd-journald-override.conf"
+SRC_URI_append_p10bmc = " file://journald-size-policy.conf"
 
 FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
 FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
 FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
 
-FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
-FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
-FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
+FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
+FILES_${PN}_append_p10bmc = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
+FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
 
 do_install_append_ibm-ac-server() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
         install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
 }
-do_install_append_rainier() {
+do_install_append_p10bmc() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
         install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf