summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-x86
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2018-06-26 16:43:14 -0700
committerPatrick Venture <venture@google.com>2018-06-26 16:45:44 -0700
commit2b6dd0230a56eeb562bbb9e091c06a55cf2ac9ac (patch)
tree0899916a99edd3da9413fc479de3ff5bb18b54ad /meta-openbmc-machines/meta-x86
parentd4250f4a8cd9f4cccf46774e62cdf6cd5f0333b0 (diff)
downloadtalos-openbmc-2b6dd0230a56eeb562bbb9e091c06a55cf2ac9ac.tar.gz
talos-openbmc-2b6dd0230a56eeb562bbb9e091c06a55cf2ac9ac.zip
meta-x86: quanta--q71l: drop ipmi-fru-properties
The ipmi-fru-properties were placeholder. Drop the definition. Change-Id: Ie188003dcd2710f243c36891fece1c6c352349b4 Signed-off-by: Patrick Venture <venture@google.com>
Diffstat (limited to 'meta-openbmc-machines/meta-x86')
-rw-r--r--meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf1
-rw-r--r--meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties.bb23
-rw-r--r--meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties/extra-properties.yaml71
3 files changed, 0 insertions, 95 deletions
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index 96645fc76..b36a09821 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -30,7 +30,6 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo
# These are meant to include the inventory config.yaml and so on.
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "q71l-ipmi-fru-properties"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config = "q71l-ipmi-channel-config-native"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native"
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties.bb b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties.bb
deleted file mode 100644
index 0297b8b1b..000000000
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "FRU properties config for ipmi-fru-parser"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-ipmi-fru
-
-SRC_URI += "file://extra-properties.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-properties"
-
-S = "${WORKDIR}"
-
-do_install() {
- # TODO: install this to inventory_datadir
- # after ipmi-fru-parser untangles the host
- # firmware config from the machine inventory.
- DEST=${D}${properties_datadir}
-
- install -d ${DEST}
- install extra-properties.yaml ${DEST}/.
-}
-
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties/extra-properties.yaml b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties/extra-properties.yaml
deleted file mode 100644
index 75bbe0c27..000000000
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-properties/extra-properties.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-/system/chassis/motherboard/cpu0:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/motherboard/cpu1:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/motherboard/cpu2:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/motherboard/cpu3:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/motherboard/bmc:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/motherboard:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/pdb:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
-
-/system/chassis/fp:
- xyz.openbmc_project.Inventory.Decorator.Replaceable:
- FieldReplaceable: 'true'
- xyz.openbmc_project.Inventory.Decorator.Cacheable:
- Cached: 'true'
- xyz.openbmc_project.Inventory.Item:
- Present: 'true'
OpenPOWER on IntegriCloud