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
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 5a91a72..ecce081 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 @@
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 @@
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 c0bfa9f..0000000
--- 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 ac13efb..0000000
--- 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 124aac3..0000000
--- 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 9fa1fed..0000000
--- 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