meta-ibm: Rename device callout files

The entity-manager config for these systems now provides the Compatible
inventory decorator interface which has Names property values like
com.ibm.Hardware.Chassis.Model.Everest.

The error logging code code uses these values to lookup a callout file,
so rename them to match.

Tested:
- Files show up in rootfs

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ic2be73fc6e5cc0114baca027c2057d9068b1cd1f

5 files changed, 13 insertions, 13 deletions

diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,bonnell_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json
index d6948dc0b5..d6948dc0b5 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,bonnell_dev_callouts.json
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json
index e2d4c54a9f..e2d4c54a9f 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,rainier-2u_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json
index c5f34c7284..c5f34c7284 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,rainier-2u_dev_callouts.json
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,rainier-4u_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json
index f8767f4a6b..f8767f4a6b 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,rainier-4u_dev_callouts.json
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
index 1de019fecf..c8f323c002 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -3,14 +3,14 @@ PACKAGECONFIG:append:p10bmc = " openpower-pels"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI:append:p10bmc = " file://ibm,rainier-2u_dev_callouts.json"
-SRC_URI:append:p10bmc = " file://ibm,rainier-4u_dev_callouts.json"
-SRC_URI:append:p10bmc = " file://ibm,everest_dev_callouts.json"
-SRC_URI:append:p10bmc = " file://ibm,bonnell_dev_callouts.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json"
-FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,bonnell_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json"
 
 #Enable phal feature, if available.
 PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}"
@@ -18,9 +18,9 @@ PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg ipl"
 
 do_install:append:p10bmc() {
     install -d ${D}/${datadir}/phosphor-logging/pels
-    install -m 0644 ${WORKDIR}/ibm,rainier-2u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json
-    install -m 0644 ${WORKDIR}/ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json
-    install -m 0644 ${WORKDIR}/ibm,everest_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json
-    install -m 0644 ${WORKDIR}/ibm,bonnell_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,bonnell_dev_callouts.json
-    ln -s ./ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-1s4u_dev_callouts.json
+    install -m 0644 ${WORKDIR}/com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Rainier2U_dev_callouts.json
+    install -m 0644 ${WORKDIR}/com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json
+    install -m 0644 ${WORKDIR}/com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Everest_dev_callouts.json
+    install -m 0644 ${WORKDIR}/com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Bonnell_dev_callouts.json
+    ln -s ./com.ibm.Hardware.Chassis.Model.Rainier4U_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/com.ibm.Hardware.Chassis.Model.Rainier1S4U_dev_callouts.json
 }