From dab1ed2929b77cf47f0286b8aef2038ee4fe9693 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 22 Feb 2019 10:00:51 -0800 Subject: meta-phosphor: drop ipmi-channel-config phosphor-host-ipmid no longer does anything with the information specified by the ipmi-channel-config, therefore drop it. (From meta-phosphor rev: 14e259d7b53de1bae200ee5c5dbf201ffd105543) Change-Id: I74057fd68ba7e46e5cf5850eaf6434cb6bb37ec9 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- .../conf/distro/include/phosphor-defaults.inc | 7 ------- .../ipmi/phosphor-ipmi-channel-inventory-native.bb | 22 ---------------------- .../phosphor-ipmi-channel-inventory/channel.yaml | 6 ------ .../ipmi/phosphor-ipmi-host_git.bb | 1 - 4 files changed, 36 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index b1ccbcdae..f1bc7ea27 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -160,13 +160,6 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory ?= \ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory ?= \ "phosphor-ipmi-sensor-inventory-native" -# The phosphor-host-ipmid application is data-driven and requires an input -# mapping of IPMI channel to DBus objects interfaces and properties. -# This virtual is a native recipe that provides that mapping by installing -# configuration files in the format and native sysroot location expected by -# the phosphor-host-ipmid build process in the native sysroot. -PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config ?= "phosphor-ipmi-channel-inventory-native" - # The phosphor-host-ipmid application is data-driven and requires an input # yaml of entity association record metadata. # This virtual is a native recipe that provides that mapping by installing diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb deleted file mode 100644 index 043200a71..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Sample channel configuration for phosphor-host-ipmid" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-channel-config" - -SRC_URI += "file://channel.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe is supposed to create an output yaml file with - # a sample output file. - - DEST=${D}${sensor_datadir} - install -d ${DEST} - install channel.yaml ${DEST}/channel.yaml -} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml deleted file mode 100644 index 819f25198..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Channel Number (must be unique) is the key -1: - # ifName the ethernet device name (used in the dbus path) - ifName: eth0 -2: - ifName: eth1 diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 574d03b77..ceb3c0d7a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -33,7 +33,6 @@ DEPENDS += "sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" -DEPENDS += "virtual/phosphor-ipmi-channel-config" DEPENDS += "virtual/phosphor-ipmi-entity-config" DEPENDS += "boost" DEPENDS += "sdeventplus" -- cgit v1.2.3