diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi')
7 files changed, 7 insertions, 15 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 30b540b7d..bb16749a9 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "ef5e09252dba451acda30e53e8f5b28f08eac0cb" +SRCREV = "958f1ce952849300ebfd30cc04ce86937d3bc718" 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 350083e6e..3b504e1c0 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 = "00d5f0de56f3e453be37c2ffc45418fb406396a2" +SRCREV = "826e17355db0a575e0ad60e25bf82480ac711135" 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 ccea00c88..69b10a11f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "615c69ef597a044c0d3e7747d9603263f8e462dc" +SRCREV = "7a5dcd8c213972b5abc6e05c663d37cf004bda7f" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index e11235609..d79078a1b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -12,7 +12,6 @@ inherit pythonnative require ${PN}.inc DEPENDS += " \ - virtual/phosphor-ipmi-fru-hostfw-config\ virtual/phosphor-ipmi-fru-inventory \ virtual/phosphor-ipmi-fru-properties \ systemd \ @@ -36,13 +35,6 @@ 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 \ PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 04ffdfd04..d148d4c6e 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 = "db2e8c45727ba98e26778b8c754b92e093e6921c" +SRCREV = "2a5d8d1ffeabb0484e52b591bb43bfa886d45731" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service index 62687d68c..ab898313a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service @@ -11,7 +11,6 @@ Wants=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service Wants=clear-once.service After=clear-once.service -Requires=org.openbmc.HostIpmi.service After=org.openbmc.HostIpmi.service [Service] 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 0654cfeb0..314b70fd3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -71,12 +71,13 @@ WHITELIST_CONF = " \ ${S}/host-ipmid-whitelist.conf \ " EXTRA_OECONF = " \ - WHITELIST_CONF="${WHITELIST_CONF}" \ 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 \ - POWER_READING_SENSOR=${datadir}/ipmi-providers/power_reading.json\ + " +EXTRA_OECONF_append = " \ + WHITELIST_CONF="${WHITELIST_CONF}" \ " S = "${WORKDIR}/git" |