diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2021-03-25 19:43:56 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-04-08 19:38:24 +0300 |
| commit | b6ff3eb92ef1b12e2562ad1e1f74371cf4d51e75 (patch) | |
| tree | 48ebe0b59f0148646687fd991b1ea95e35e5cf1c | |
| parent | 6234872b26397cb8b114e4c4bc48a22666ae86cb (diff) | |
| download | openbmc-b6ff3eb92ef1b12e2562ad1e1f74371cf4d51e75.tar.xz | |
ibm: inventory-manager: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Tested: Built rainier and verified files were installed:
rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-inventory-manager/ibm,everest_associations.json
rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-inventory-manager/ibm,rainier-4u_associations.json
rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-inventory-manager/ibm,rainier-2u_associations.json
Change-Id: I422374d25966e731147eebd1772d5cfc4f62f9d9
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json (renamed from meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json) | 0 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json (renamed from meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json) | 0 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json (renamed from meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json) | 0 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend | 6 |
4 files changed, 3 insertions, 3 deletions
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index bf797d94c..bf797d94c 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 348cb9755..348cb9755 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 7841a966a..7841a966a 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index af512973a..607546b9d 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -3,8 +3,8 @@ PACKAGECONFIG_append_ibm-ac-server = " associations" SRC_URI_append_ibm-ac-server = " file://associations.json" DEPENDS_append_ibm-ac-server = " inventory-cleanup" -PACKAGECONFIG_append_rainier = " associations" -SRC_URI_append_rainier = " \ +PACKAGECONFIG_append_p10bmc = " associations" +SRC_URI_append_p10bmc = " \ file://ibm,rainier-2u_associations.json \ file://ibm,rainier-4u_associations.json \ file://ibm,everest_associations.json \ @@ -15,7 +15,7 @@ do_install_append_ibm-ac-server() { install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } -do_install_append_rainier() { +do_install_append_p10bmc() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/ibm,rainier-2u_associations.json ${D}${base_datadir}/ibm,rainier-2u_associations.json install -m 0755 ${WORKDIR}/ibm,rainier-4u_associations.json ${D}${base_datadir}/ibm,rainier-4u_associations.json |