diff options
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/ipmi')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-config-example-native.bb | 22 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb | 16 |
2 files changed, 15 insertions, 23 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-config-example-native.bb deleted file mode 100644 index 58c7a398a..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-config-example-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Phosphor IPMI FRU Configuration Example" -DESCRIPTION = "An example Phosphor IPMI FRU IPMI to \ -DBUS mapping configuration." - -PR = "r1" - -inherit native - -require phosphor-ipmi-fru.inc - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}/git" - -do_install() { - SRC=${S}/example-map.yaml - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - # TODO - install the example, once one is provided by ipmi-fru-parser. - # install-data ${SRC} ${DEST} -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb index e0fcb0f20..d6f8c8f1a 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb @@ -5,12 +5,17 @@ PR = "r1" inherit autotools pkgconfig inherit obmc-phosphor-systemd inherit obmc-phosphor-ipmiprovider-symlink +inherit phosphor-ipmi-fru +inherit pythonnative require ${PN}.inc DEPENDS += " \ - virtual/phosphor-ipmi-fru-config \ + virtual/phosphor-ipmi-fru-hostfw-config\ + virtual/phosphor-ipmi-fru-inventory \ systemd \ + python-mako-native \ + python-pyyaml-native \ phosphor-ipmi-host \ phosphor-mapper \ autoconf-archive-native \ @@ -27,3 +32,12 @@ HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" + +# TODO: Fix the the ipmi-fru-parser code generator to handle split +# host firmware / inventory YAML and replace the OECONF below with: +# +# EXTRA_OECONF += "INVENTORY_YAML=${inventory_datadir}/config.yaml" +# EXTRA_OECONF += "HOSTFW_YAML=${hostfw_datadir}/config.yaml" +# +# For now the generator requires them to already be combined so we have: +EXTRA_OECONF = "YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml" |