diff options
4 files changed, 36 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb new file mode 100644 index 000000000..33c2aba90 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb @@ -0,0 +1,21 @@ +SUMMARY = "Sample channel configuration for phosphor-host-ipmid" +PR = "r1" + +inherit native +inherit phosphor-ipmi-host +inherit obmc-phosphor-license + +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/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml new file mode 100644 index 000000000..819f25198 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml @@ -0,0 +1,6 @@ +# 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/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb index 583c0b12c..c9274c20f 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb @@ -24,6 +24,7 @@ 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" RDEPENDS_${PN}-dev += "phosphor-logging" RDEPENDS_${PN}-dev += "phosphor-mapper-dev" @@ -52,6 +53,7 @@ EXTRA_OECONF = " \ SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ + CHANNEL_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/channel.yaml \ " S = "${WORKDIR}/git" diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 431ba23dd..2317d9a4e 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -168,6 +168,13 @@ PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= \ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory ?= \ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-sensor-inventory-mrw-native', '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-logging application has a data driven plugin that adds FRU # callout information to error logs, when applications generating error logs # add the requisite callout metadata to the systemd journal. The plugin requires |
