diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2023-07-19 19:19:54 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-07-19 19:24:05 +0300 |
commit | dc6bf15335e7d087f3a07729e76392c62da51242 (patch) | |
tree | e5943ed5fa82013ceaf3cf46f4ad3da10c51bc7d /meta-phosphor | |
parent | 89f4cadc4a895ae5bda9070fdc7fbdc6c3d3448c (diff) | |
download | openbmc-dc6bf15335e7d087f3a07729e76392c62da51242.tar.xz |
meta-phosphor: phosphor-ipmi-fru: remove unused native recipes
phosphor-ipmi-fru has some complex YAML merging recipes that are not
even used. All of the YAML files provided by these recipes are empty
and there is not a single example of a bbappend replacing them with
a non-empty version. Delete these recipes and some of the complexity
in the merge recipe.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie46e1d2c9de86b0b214c521e49d4a5a6365d9b27
Diffstat (limited to 'meta-phosphor')
5 files changed, 1 insertions, 104 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb index 5a91a728fa..ecce0816c3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb @@ -6,8 +6,6 @@ fru-gen parser parses the merged config file and generates cpp file" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory" -DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory" -DEPENDS += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" PROVIDES += "virtual/phosphor-ipmi-fru-merge-config" PR = "r1" @@ -18,6 +16,5 @@ do_install:append() { SRC=${config_datadir} DEST=${D}${config_datadir} install -d ${DEST} - cat ${SRC}/config.yaml ${SRC}/bmc-fru-config.yaml > ${DEST}/fru_config.yaml - cat ${SRC}/fru-config-not-sent-by-host.yaml >> ${DEST}/fru_config.yaml + cat ${SRC}/config.yaml > ${DEST}/fru_config.yaml } diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb deleted file mode 100644 index c0bfa9fc1d..0000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "BMC accesible FRU inventory map for phosphor-ipmi-host" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" -PR = "r1" - -SRC_URI += "file://bmc-fru-config.yaml" - -S = "${WORKDIR}" - -inherit phosphor-ipmi-host -inherit native - -do_install:append() { - DEST=${D}${config_datadir} - install -d ${DEST} - install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml -} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml deleted file mode 100644 index ac13efb44f..0000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# A YAML similar to this sample would have to be generated, for eg with MRW -# inputs and system configuration, to depict IPMI FRU information. -# -# This file maps phosphor dbus inventory properties to IPMI properties -# -# This YAML could help generate C++ code. -# Format of the YAML: -# Fruid: -# Associated Fru paths -# d-bus Interfaces -# d-bus Properties -# IPMI Fru mapping -#5: -# /system/chassis/motherboard/fan1: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Product -#6: -# /system/chassis/motherboard/boxelder/bmc: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Board -# xyz.openbmc_project.Inventory.Decorator.Asset: -# BuildDate: -# IPMIFruProperty: Mfg Date -# IPMIFruSection: Board -# SerialNumber: -# IPMIFruProperty: Serial Number -# IPMIFruSection: Board -# PartNumber: -# IPMIFruProperty: Part Number -# IPMIFruSection: Board -# Manufacturer: -# IPMIFruProperty: Manufacturer -# IPMIFruSection: Board -#7: -# /system/chassis/motherboard/boxelder/bmc/ethernet: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Product diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb deleted file mode 100644 index 124aac3cff..0000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "The inventory map of frus not sent by host for phosphor-ipmi-host" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" -PR = "r1" - -SRC_URI += "file://fru-config-not-sent-by-host.yaml" - -S = "${WORKDIR}" - -inherit phosphor-ipmi-host -inherit native - -do_install:append() { - DEST=${D}${config_datadir} - install -d ${DEST} - install fru-config-not-sent-by-host.yaml ${DEST}/fru-config-not-sent-by-host.yaml -} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml deleted file mode 100644 index 9fa1fed43f..0000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# A YAML similar to this sample would have to be generated, for eg with MRW -# inputs and system configuration, to depict IPMI FRU information. -# -# This file maps phosphor dbus inventory properties to IPMI properties -# -# This YAML could help generate C++ code. -# Format of the YAML: -# Fruid: -# Associated Fru paths -# d-bus Interfaces -# d-bus Properties -# IPMI Fru mapping -#20: -# /system/chassis/motherboard/gv100card0: -# entityID: 3 -# entityInstance: 1 -# interfaces: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Board Name -# IPMIFruSection: Board |