From 0a544b5f874e81a1c4579d3de113c176668b6c80 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 28 Jan 2017 12:51:42 -0500 Subject: ipmi: Add virtual/phosphor-ipmi-fru-inventory This virtual provides a configuration file that describes the IPMI inventory implementation details to ipmi-fru-parser. Add a recipe that provides the sample that comes with ipmi-fru-parser. Add a recipe that generates the file from an MRW. Change-Id: I331fec22fb603146cbe6b2d57256a2b29adce46b Signed-off-by: Brad Bishop --- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 8 ++++++++ meta-phosphor/conf/distro/openbmc-phosphor.conf | 2 ++ 2 files changed, 10 insertions(+) (limited to 'meta-phosphor/conf/distro') diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 221e96094..a505bcdb3 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -42,5 +42,13 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config ?= "phosphor-ipmi-fru-config # the phosphor-ipmi-fru build process. PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "phosphor-ipmi-fru-hostfw-config-example-native" +# The phosphor-ipmi-fru application is data-driven and requires an input +# mapping of IPMI inventory metadata 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-ipmi-fru build process in the native sysroot. +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory ?= \ + "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-inventory-mrw-native', 'phosphor-ipmi-fru-inventory-example-native')}" + OBMC_DBUS_PATH_ROOT ?= "/xyz/openbmc_project" OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project" diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index f18caf7aa..2460e70c2 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -50,4 +50,6 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" # TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3. PREFERRED_VERSION_python-pygobject = "2.%" +INHERIT = "obmc-phosphor-utils" + include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -- cgit v1.2.1