diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi')
12 files changed, 62 insertions, 32 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 3b504e1c0..e77ecd8e6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -16,7 +16,7 @@ DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "826e17355db0a575e0ad60e25bf82480ac711135" +SRCREV = "8bc117792fbf118dd74d015546c22612961ccc26" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-entity-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-entity-inventory-native.bb deleted file mode 100644 index acc693eba..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-entity-inventory-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Sample entity 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-entity-config" - -SRC_URI += "file://entity.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 entity.yaml ${DEST}/entity.yaml -} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 9be1ab3a5..0b6701efd 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" -SRCREV = "c3f5618ffd64bc8d1718cafe499c38b359861e97" +SRCREV = "7a1b2033e8cce2fe711d8a033885d9048325332d" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 69b10a11f..686b5bf58 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -2,30 +2,64 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash" SUMMARY = "Phosphor OEM IPMI In-band Firmware Update over BLOB" DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the firmware update handler over the BLOB protocol." PR = "r1" -PV = "0.1+git${SRCPV}" +PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit autotools pkgconfig inherit obmc-phosphor-ipmiprovider-symlink +inherit systemd DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-blobs" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" +DEPENDS += "systemd" DEPENDS += "ipmi-blob-tool" DEPENDS += "pciutils" +PACKAGECONFIG ?= "cleanup-delete" +PACKAGECONFIG[cleanup-delete] = "--enable-cleanup-delete, --disable-cleanup-delete" +# If using static-layout, reboot-update is a good option to handle updating. +PACKAGECONFIG[reboot-update] = "--enable-reboot-update, --disable-reboot-update" + +# Default options for supporting various flash types: +PACKAGECONFIG[static-bmc] = "--enable-static-layout, --disable-static-layout" +PACKAGECONFIG[ubitar-bmc] = "--enable-tarball-ubi, --disable-tarball-ubi" +PACKAGECONFIG[host-bios] = "--enable-host-bios, --disable-host-bios" + +# Hardware options to enable transmitting the data from the host. +PACKAGECONFIG[aspeed-p2a] = "--enable-aspeed-p2a, --disable-aspeed-p2a" +PACKAGECONFIG[aspeed-lpc] = "--enable-aspeed-lpc, --disable-aspeed-lpc" +PACKAGECONFIG[nuvoton-lpc] = "--enable-nuvoton-lpc, --disable-nuvoton-lpc" + EXTRA_OECONF = "--disable-tests --disable-build-host-tool" +# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. +IPMI_FLASH_BMC_ADDRESS ?= "0" +EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" + S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "7a5dcd8c213972b5abc6e05c663d37cf004bda7f" +SRCREV = "cf0e5de3f838898861208f8e2743aaf5221a5d5e" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ + phosphor-ipmi-flash-bmc-verify.target \ + phosphor-ipmi-flash-bmc-update.target" + +# If they enabled host-bios, add those three extra targets. +HOST_BIOS_TARGETS = "phosphor-ipmi-flash-bios-prepare.target \ + phosphor-ipmi-flash-bios-verify.target \ + phosphor-ipmi-flash-bios-update.target" + +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" +BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'cleanup-delete', 'libfirmwarecleanupblob.so', '', d)}" do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index e8e89bf2e..b50d18e9e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser" -SRCREV = "fcb1a256189a67012b5bd630597454c6e9d75bd3" +SRCREV = "de0a59ee05cfd97cca16654fc21654fc89ab72fa" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index d148d4c6e..fa82004f3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "2a5d8d1ffeabb0484e52b591bb43bfa886d45731" +SRCREV = "894d022017215acceafc9e3f21379534f5396d21" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-entity-inventory/entity.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/entity.yaml index f41c2fda6..f41c2fda6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-entity-inventory/entity.yaml +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/entity.yaml diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 5e6c4b5e6..877e3eb57 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py @@ -12,6 +12,11 @@ import sys import yaml import copy +# Custom representer for None types. This is to handle empty dictionaries. +# By default Pyyaml outputs these as "null", whereas we want an empty character. +def represent_none(self, _): + return self.represent_scalar('tag:yaml.org,2002:null', '') + def dict_merge(target, source): """Deep merge for dicts. @@ -43,6 +48,8 @@ if len(sys.argv) == 2: # No overrides to handle sys.exit(0) +yaml.add_representer(type(None), represent_none) + target_filename = sys.argv[1] with open(target_filename) as target_file: data = yaml.safe_load(target_file) 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 314b70fd3..f5606cbf7 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -14,6 +14,8 @@ inherit obmc-phosphor-systemd inherit phosphor-ipmi-host inherit pythonnative +SRC_URI += "file://entity.yaml" + def ipmi_whitelists(d): whitelists = d.getVar( 'VIRTUAL-RUNTIME_phosphor-ipmi-providers', True) or '' @@ -33,7 +35,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-entity-config" DEPENDS += "boost" DEPENDS += "sdeventplus" @@ -74,7 +75,6 @@ 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 \ - ENTITY_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/entity.yaml \ " EXTRA_OECONF_append = " \ WHITELIST_CONF="${WHITELIST_CONF}" \ @@ -103,6 +103,16 @@ SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" +do_replace_entity_default() { + # The in-repo provided default is tailored to testing the ipmid code. + # Replace it with a reasonable default for users. + cp entity.yaml ${S}/scripts/entity-example.yaml +} + +do_patch_append() { + bb.build.exec_func('do_replace_entity_default', d) +} + #Collect all hardcoded sensor yamls from different recipes and #merge all of them with sensor.yaml. python do_merge_sensors () { diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index 1ef93d5db..127a8c659 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "8188d7651c23502f88f9bf850ab7e549f6463997" +SRCREV = "bbfd00abdbc6d2f7c0389eae91cc055a1d4fe0c3" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 370e585ea..a26d7cd97 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "052b7cf37411a1bb69af1e6ce541a16021fffa9f" +SRCREV = "0a269046d0d9fcd690ccbb129ae58a3c1450b04e" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml index ec82afed6..8188612b3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml @@ -207,6 +207,7 @@ gpu_func_sensor: type: "bool" assert: true deassert: false + xyz.openbmc_project.Inventory.Item.Accelerator: # Field replaceable doesn't come as a sensor data # but we know that GPU is Field replaceable so setting # true in both cases. |