diff options
22 files changed, 133 insertions, 161 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf index 97d0bc269..d87b732ea 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf @@ -11,4 +11,4 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "firestone-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "firestone-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..90276695b --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb @@ -0,0 +1,22 @@ +SUMMARY = "Firestone IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +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}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map.bb deleted file mode 100644 index 52ff03e79..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Firestone IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf index 5653e5bde..436c68a97 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf @@ -11,4 +11,4 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "garrison-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "garrison-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..d119208f4 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb @@ -0,0 +1,22 @@ +SUMMARY = "Garrison IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +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}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb deleted file mode 100644 index 05a622fce..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Garrison IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index 20cd7833f..c0c5bfb0b 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -15,4 +15,4 @@ PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml" PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f" PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "palmetto-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..2b5348a9f --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb @@ -0,0 +1,23 @@ +SUMMARY = "Palmetto IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +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}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} + diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map.bb deleted file mode 100644 index b9e1fcb6b..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Palmetto IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} - diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf index 7caf5a0fe..2801ee516 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -4,7 +4,6 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'cpld-trigger' -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "romulus-ipmi-inventory-map" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map.bb deleted file mode 100644 index e581d0ba7..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Romulus IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - install -d ${DEST} - - # TODO - Run an MRW script. -} - diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index a93e11d60..bedb6df2c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -6,7 +6,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_MACHINE_FEATURES += "obmc-mrw" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-pre-post' -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "witherspoon-ipmi-inventory-map" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-inventory-map.bb deleted file mode 100644 index 18ce20fc3..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-inventory-map.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Witherspoon IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - install -d ${DEST} - - # TODO - Run an MRW script. -} diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index b0816cc0c..9b1050a08 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -6,7 +6,7 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "zaius-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..96d167450 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb @@ -0,0 +1,23 @@ +SUMMARY = "Zaius IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +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}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} + diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map.bb deleted file mode 100644 index 21985ac39..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Zaius IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} - diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf index 819ee9d00..5e430268d 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf @@ -13,4 +13,4 @@ FLASH_SIZE = "32768" OBMC_FAN_INSTANCES = "0 1 2 3 4 5" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "barreleye-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "barreleye-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..8b9e3ceff --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb @@ -0,0 +1,23 @@ +SUMMARY = "Barreleye IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +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}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} + diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map.bb deleted file mode 100644 index 7b96fc9be..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Barreleye IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} - 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" diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index a505bcdb3..3006137c9 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -24,15 +24,6 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd" PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user" PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent" -# virtual/phosphor-ipmi-fru-config -# -# 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-config ?= "phosphor-ipmi-fru-config-example-native" - # virtual/phosphor-ipmi-fru-hostfw-config # # The phosphor-ipmi-fru application is data-driven and requires an input |
