diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
37 files changed, 106 insertions, 64 deletions
diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 239dbbd6b..15395148d 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "dec5877c7e1219299042671cdf82589a081d583f" +SRCREV = "b57d75e2b1871fe048216ae98ae3a224ca3adb9e" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 0a9746259..08f3c0b9f 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "15c49902cf030a91a5b4bd325d185ee74b760359" +SRCREV = "96cdaefe75b8b4eebee21757d9e826d99cf87ab5" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 006f9418e..7316d8ee6 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -16,9 +16,9 @@ DEPENDS += "autoconf-archive-native \ " SRC_URI += "git://github.com/openbmc/obmc-console" -SRC_URI += "file://${PN}.conf" +SRC_URI += "file://${BPN}.conf" -SRCREV = "1cecc5deeae236e9886f624ea7168e075f057047" +SRCREV = "c5ce2cbd12e395749c3b4abedf0d81f49b402b70" PV = "1.0+git${SRCPV}" REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 25e49ba34..12c5ee108 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbus++-native" SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "1f0e2ce6e1cb78a59a0015b160816b71156b03c6" +SRCREV = "ddc9e9f9d6ed0282ec6c1421a706b45f3c09ebcc" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb index 80954f61f..6fadcae21 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb @@ -1,12 +1,11 @@ SUMMARY = "Phosphor DBus Monitor Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ +DESCRIPTION = "Meta-recipe, pulling in non-native recipes that wish to add \ configuration files to the /usr/share/phosphor-dbus-monitor filesystem." HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit native inherit phosphor-dbus-monitor PHOSPHOR_DBUS_MONITOR_CONFIGS ??= "" @@ -19,3 +18,5 @@ DEPENDS += "${PHOSPHOR_DBUS_MONITOR_CONFIGS}" do_install() { mkdir -p ${D}${config_dir} } + +FILES_${PN} += "${config_dir}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index 463bd8364..ae2274369 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -20,7 +20,7 @@ SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" DEPENDS += " \ - ${PN}-config-native \ + ${PN}-config \ phosphor-logging \ autoconf-archive-native \ sdbusplus-native \ @@ -34,5 +34,5 @@ FILES_phosphor-msl-verify = "${bindir}/phosphor-msl-verify" S = "${WORKDIR}/git" EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_NATIVE}${config_dir} \ + YAML_PATH=${STAGING_DIR_HOST}${config_dir} \ " diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index f49201721..eb753cb69 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "fa180596fe2a3c6fe65e48055e02e0c3e4ef5977" +SRCREV = "004938eb17af464fc1ba02f883adb78ad3bd40dd" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 780f889df..922124798 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -56,11 +56,11 @@ MGR_SVC ?= "xyz.openbmc_project.Dump.Manager.service" SYSTEMD_SUBSTITUTIONS += "BMC_DUMP_PATH:${bmc_dump_path}:${MGR_SVC}" FILES_${PN}-manager += " \ - ${sbindir}/phosphor-dump-manager \ + ${bindir}/phosphor-dump-manager \ ${exec_prefix}/lib/tmpfiles.d/coretemp.conf \ ${datadir}/dump/ \ " -FILES_${PN}-monitor += "${sbindir}/phosphor-dump-monitor" +FILES_${PN}-monitor += "${bindir}/phosphor-dump-monitor" FILES_${PN}-dreport += "${bindir}/dreport" FILES_${PN}-scripts += "${dreport_dir}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb index 30da6eab8..d4176c512 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb @@ -1,7 +1,7 @@ # Provides the config file for the phosphor-fan-presence application. # The default config file is empty. To provide a real one, # append this recipe in a layer, add: -# FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # and provide a config file. SUMMARY = "Config file for phosphor-fan-presence" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 141ec0ffb..85619eab0 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "d9a580aa5037fdb08911940263a580b036f2d9fa" +SRCREV = "efbe7abd508a3e24fc4d1f4ed0ac6c04836c3d72" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 9b204fe04..276feee0b 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -6,14 +6,15 @@ PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit flto-automake pkgconfig +inherit autotools pkgconfig inherit phosphor-pid-control inherit obmc-phosphor-ipmiprovider-symlink +inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "2192a6daefe48055e063861b3a33a6c2d91ddf40" +SRCREV = "a7ec8350d17b70153cebe666d3fbe88bddd02a1a" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if @@ -32,6 +33,14 @@ DEPENDS += "boost" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" +SERVICE_FILE = "phosphor-pid-control.service" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "${SERVICE_FILE}" + +EXTRA_OECONF = " \ + SYSTEMD_TARGET="multi-user.target" \ + " + FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor" # The following installs the OEM IPMI handler for the fan controls. diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 4cbac906b..8b4886e64 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "286b9118a35ba8c212972b9c30a257ee41c5d7d2" +SRCREV = "336e96c667adf8401c8ed772d681a17c35b94b44" S = "${WORKDIR}/git" 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. diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 7dcdc6645..5decc70c8 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -13,12 +13,13 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "boost" DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" -SRCREV = "5b1417bd21d1e9c00b25bb6db700aec442af746d" +SRCREV = "97ddb72359663b5ca9d8e0c22588f0022f729ced" S = "${WORKDIR}/git" do_install_append() { diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index f710ed087..69da44c97 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -23,6 +23,7 @@ DEPENDS += "virtual/phosphor-logging-callouts" DEPENDS += "phosphor-logging-error-logs-native" DEPENDS += "phosphor-logging-native" DEPENDS += "libcereal" +DEPENDS += "sdeventplus" PACKAGE_BEFORE_PN = "${PN}-test" FILES_${PN}-test = "${bindir}/*-test" @@ -53,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "0a0b5ea558adeb109a3ac52e55ad720e188adb90" +SRCREV = "0a2c1a23327ac720b19eb1b12521d8fde95de2d5" S = "${WORKDIR}/git" @@ -64,6 +65,7 @@ DEPENDS_remove_class-native = " \ sdbus++ \ systemd \ libcereal \ + sdeventplus \ " # Do not DEPEND on the specified packages for native SDK build @@ -74,6 +76,7 @@ DEPENDS_remove_class-nativesdk = " \ libcereal \ systemd \ phosphor-dbus-interfaces \ + sdeventplus \ " PACKAGECONFIG ??= "metadata-processing install_scripts" diff --git a/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules b/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules deleted file mode 100644 index 12e90d86c..000000000 --- a/meta-phosphor/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="misc", KERNEL=="aspeed-mbox", TAG+="systemd" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service index abc97e522..c491b1812 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service @@ -2,8 +2,6 @@ Description=Phosphor MBOX Daemon BindsTo=dev-aspeed\x2dlpc\x2dctrl.device After=dev-aspeed\x2dlpc\x2dctrl.device -BindsTo=dev-aspeed\x2dmbox.device -After=dev-aspeed\x2dmbox.device Requires=xyz.openbmc_project.Control.Host.service After=xyz.openbmc_project.Control.Host.service diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index e49daa195..79de7fa24 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -16,11 +16,10 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/mboxbridge.git" -SRC_URI += "file://99-aspeed-mbox.rules" SRC_URI += "file://99-aspeed-lpc-ctrl.rules" SRC_URI += "file://aspeed-lpc-ctrl-h.patch" -SRCREV="fac3689e77d37aca9c85dafabf921a847b1c4e02" +SRCREV="4b8203d721b1114f09712e5ca04e18d10147d8cd" PROVIDES += "mboxctl" @@ -33,7 +32,6 @@ CFLAGS_append = " -I include" do_install_append() { install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-mbox.rules ${D}/lib/udev/rules.d install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d } diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 175b37862..96a65c182 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -40,6 +40,8 @@ SUMMARY_${PN}-extras = "Extra features" RDEPENDS_${PN}-extras = " \ bmcweb \ phosphor-bmcweb-cert-config \ + phosphor-nslcd-cert-config \ + phosphor-nslcd-authority-cert-config \ obmc-ikvm \ phosphor-dbus-monitor \ phosphor-systemd-policy \ diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 8eea299ae..44305c423 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "c4a336fb15464b9f4a7328c02cb43285a6eb1e58" +SRCREV = "3d300fca24b30864b3e9a4f5768cfe5e769458ae" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index c5062701f..5bf754749 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "15266a96d758d4dbc1d3095e652ae083b24732c7" +SRCREV = "1cbd1c6da17a85ec7213744cf2d1e56fcba3e34e" PV = "0.1+git${SRCPV}" @@ -17,6 +17,7 @@ SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.exitairsensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.ipmbsensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.intrusionsensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.psusensor.service" +SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.mcutempsensor.service" DEPENDS = "boost nlohmann-json sdbusplus i2c-tools libgpiod" inherit cmake systemd diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index de38de08c..8515f21a8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -39,7 +39,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "d0ce7925d77c56c142f64b2c6ae55f0020c06ba8" +SRCREV = "2227bd52c5bb8d62dcfe33b58d65515d21e9be17" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 5ba755456..b02038c36 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -132,6 +132,6 @@ HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TG SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "5b95027528483ec7ce8761a2fdd018d671979d0b" +SRCREV = "d6fe3150e1949fbada806d271644eb7590535047" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 2e4533d61..1acefd1a7 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -39,5 +39,5 @@ DBUS_SERVICE_phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "75b5a6fc4c0c06f43623fe0e746fd55e667dceb3" +SRCREV = "1af1223304dbf7aaecd5f238227abee95cce8b39" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index f791d68b4..79fa6206a 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "9062ed11e4b2cd96cf96d09ff99d1734b96a1780" +SRCREV = "c35135d32f9cb84b62de7b72eee3a2e87b4b3d4d" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 5d36313c9..89944bfbd 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "5bd1dec7fdc8f6a3a20e6c23dc491b3d31392bc5" +SRCREV = "f1aadb9093df7ee0789e9d3caf4e3c83a0bfbb6c" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " |