diff options
Diffstat (limited to 'meta-phosphor')
68 files changed, 142 insertions, 333 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 0d2ed898c..8f92f7045 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -512,14 +512,16 @@ do_generate_ubi_tar[depends] += " \ " do_generate_ext4_tar() { + zstd -f -k -T0 -c ${ZSTD_COMPRESSION_LEVEL} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${FLASH_EXT4_BASETYPE} > ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${FLASH_EXT4_BASETYPE}.zst ln -sf ${S}/MANIFEST MANIFEST ln -sf ${S}/publickey publickey - make_image_links rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} ${FLASH_EXT4_BASETYPE} + make_image_links rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} ${FLASH_EXT4_BASETYPE}.zst make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey make_tar_of_images ext4.mmc MANIFEST publickey ${signature_files} } do_generate_ext4_tar[dirs] = " ${S}/ext4" do_generate_ext4_tar[depends] += " \ + zstd-native:do_populate_sysroot \ ${PN}:do_image_${FLASH_EXT4_BASETYPE} \ virtual/kernel:do_deploy \ u-boot:do_populate_sysroot \ diff --git a/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass b/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass deleted file mode 100644 index 89a884a1b..000000000 --- a/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass +++ /dev/null @@ -1,38 +0,0 @@ -inherit obmc-phosphor-utils -inherit python3native - -OBMC_PYTHON_EXE="python3" -OBMC_PYTHON_EXE_class-native="nativepython3" - -DEPENDS += "python3" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PYTHON_AUTOTOOLS_PACKAGE ?= "${PN}" - -python() { - for pkg in listvar_to_list(d, 'PYTHON_AUTOTOOLS_PACKAGE'): - set_append(d, 'FILES_%s' % pkg, - d.getVar('PYTHON_SITEPACKAGES_DIR', True)) -} - -# python-setuptools does some mangling of the #! in any scripts it installs, -# which has been reported for years at pypa/setuptools#494. OE has -# workarounds in distutils3.bbclass, but we cannot inherit that here because -# it conflicts with autotools.bbclass. Port the un-mangling code here. -# -# This finds any ${PYTHON} executable path that got put into the scripts -# and reverts it back to "/usr/bin/env python3". It also reverts any full -# ${STAGING_BINDIR_NATIVE} path back to "/usr/bin". -# -do_install_append() { - for i in ${D}${bindir}/* ${D}${sbindir}/*; do - if [ -f "$i" ]; then - sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${OBMC_PYTHON_EXE}:g $i - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i - fi - done -} diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index ed47935d0..80c68dcf4 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "d0679f9bb46670c593061c4aaebec2a577cdd5c3" +SRCREV = "06345733e3389ec54018a9d8d3bf6a272b914f12" diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 17b50da0e..cc1ad3738 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -27,9 +27,6 @@ SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-updateubootvars@.service \ obmc-flash-bmc-cleanup.service \ obmc-flash-bmc-mirroruboot.service \ - reboot-guard-enable.service \ - reboot-guard-disable.service \ - force-reboot.service \ " # Name of the mtd device where the ubi volumes should be created diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 31e669b65..8d53c8dda 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -104,16 +104,17 @@ DISTRO_FEATURES_OBMC = " \ DISTRO_FEATURES_DEFAULT = " \ avahi \ + ipv4 \ + ipv6 \ + ldap \ + libc-inet-anl \ pam \ slp \ systemd \ - ldap \ - libc-inet-anl \ " DISTRO_FEATURES += " \ ${DISTRO_FEATURES_DEFAULT} \ - ${DISTRO_FEATURES_LIBC} \ ${DISTRO_FEATURES_OBMC} \ " diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 58be25a05..b90f28062 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -8,11 +8,6 @@ OBMC_POWER_INSTANCES ?= "0" OBMC_RESET_BUTTON_INSTANCES ?= "0" OBMC_WATCHDOG_INSTANCES ?= "0" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example" - # obmc-bmc-state-manager # # Provides an implementation of the xyz.openbmc_project.State.BMC diff --git a/meta-phosphor/recipes-core/systemd/systemd/default.network b/meta-phosphor/recipes-core/systemd/systemd/default.network deleted file mode 100644 index c75c3d60d..000000000 --- a/meta-phosphor/recipes-core/systemd/systemd/default.network +++ /dev/null @@ -1,4 +0,0 @@ -[Match] -Name=eth* -[Network] -DHCP=ipv4 diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 5aef993a2..1aabe378f 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -1,20 +1,26 @@ FILES_${PN}-catalog-extralocales = \ "${exec_prefix}/lib/systemd/catalog/*.*.catalog" PACKAGES =+ "${PN}-catalog-extralocales" -PACKAGECONFIG = "pam hostnamed networkd randomseed resolved sysusers timedated \ - timesyncd xz kmod coredump sysvinit" +PACKAGECONFIG = "\ + coredump \ + hostnamed \ + kmod \ + networkd \ + pam \ + randomseed \ + resolved \ + sysusers \ + sysvinit \ + timedated \ + timesyncd \ + xz \ + " FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://default.network" SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" -FILES_${PN} += "${systemd_unitdir}/network/default.network" EXTRA_OEMESON += "-Ddns-servers=''" -do_install_append() { - install -m 644 ${WORKDIR}/default.network ${D}${systemd_unitdir}/network/ -} - ALTERNATIVE_${PN} += "init" ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index 2e9894f94..5ba5ce4f2 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/pam-ipmi" -SRCREV = "c2ef3319b42d86862b479e08e652ab36a26a14db" +SRCREV = "f3919c432f849442804f065e6b40505621a69dcd" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb index bf815ce03..9d89895b0 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -1,11 +1,20 @@ SUMMARY = "sdbus++ dbus API / binding generator" DESCRIPTION = "Generates bindings against sdbusplus for dbus APIs" -inherit autotools pkgconfig -inherit obmc-phosphor-python3-autotools +inherit setuptools3 include sdbusplus-rev.inc +## The sdbusplus repository has an Apache LICENSE file, which we would +## normally check here, but the python setup script is in a subdirectory +## which requires us to set ${S} below. When we change ${S} from the root +## of the repository, bitbake can no longer find the LICENSE file. Point +## to the common Apache license file in poky's meta instead. +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +S="${WORKDIR}/git/tools" + # Provide these aliases temporarily until everyone can move over to the # new package name. PROVIDES_class-native += "sdbusplus-native" @@ -24,8 +33,4 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-pyyaml \ " -PACKAGECONFIG ??= "transaction" -PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" - BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 2c13668ba..5096a05ec 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -1,10 +1,6 @@ HOMEPAGE = "http://github.com/openbmc/sdbusplus" PR = "r1" PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "afe80cf2e5dc4aefe3b041adeb0230e61929bf12" +SRCREV = "fa3137a78e952134559bf7c41c4f29fa4afabe02" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 9cc4cdc3f..49e2f4af2 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,26 +1,20 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." -inherit autotools pkgconfig -inherit obmc-phosphor-python3-autotools - +inherit meson +inherit python3native include sdbusplus-rev.inc +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +S = "${WORKDIR}/git" + DEPENDS += " \ - autoconf-archive-native \ ${PYTHON_PN}-inflection-native \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ + boost \ + googletest \ + systemd \ " - -PACKAGECONFIG ??= "libsdbusplus transaction" -PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" - -# Remove unused sdbus++ contents (included in python3-sdbus++ package). -do_install_append() { - rm ${D}/${bindir}/sdbus++ - rmdir ${D}/${bindir} || true - rm -rf ${D}/${PYTHON_SITEPACKAGES_DIR} - rmdir ${D}/${libdir}/${PYTHON_DIR} || true -} diff --git a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py deleted file mode 100644 index a68f2e511..000000000 --- a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-chassisd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service deleted file mode 100644 index 2ca9fe327..000000000 --- a/meta-phosphor/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Chassis Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-chassisd -SyslogIdentifier=obmc-phosphor-chassisd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 894583173..933d43119 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git" -SRCREV = "582b3f025a0ca424d07aee67185d51915bdf2f46" +SRCREV = "5ed4cc0f0947e589c430618c29bd474f0fce32b3" inherit cmake pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb deleted file mode 100644 index d9dcd1af2..000000000 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Chassis Management" -DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-chassis-mgmt" -RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${BPN}.py" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 57b27d29f..2746e6d67 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 = "b1728ca01e23de1f2a676d445a478e34f2456bda" +SRCREV = "8c505da0ffd8709f3c799a855ff921cfbd446201" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service index 362e06a91..aaf7abe4d 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service @@ -1,7 +1,5 @@ [Unit] Description=Phosphor Time Manager daemon -Wants=mapper-wait@-xyz-openbmc_project-time-owner.service -After=mapper-wait@-xyz-openbmc_project-time-owner.service Wants=mapper-wait@-xyz-openbmc_project-time-sync_method.service After=mapper-wait@-xyz-openbmc_project-time-sync_method.service Wants=mapper-wait@-xyz-openbmc_project-state-host0.service diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index ebb642717..8517262f3 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -20,7 +20,7 @@ RDEPENDS_${PN} += "phosphor-network" RDEPENDS_${PN} += "phosphor-mapper" SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "248a709c83e80f81a687c971b79ff292c4778fb0" +SRCREV = "3de9698dae2d251cba482d4ccc78d58d2a02d564" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" 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 9705ecd0a..7338cf27d 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 += "${PYTHON_PN}-sdbus++-native" SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "00c8527a40650650d2826d77b6e4e6d48f68f622" +SRCREV = "264d401d288841da24b9ce1377e3c399a2f4c60a" PACKAGECONFIG ??= "libphosphor_dbus" PACKAGECONFIG[libphosphor_dbus] = " \ 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 3e4fa8ae4..0ac2c1dcc 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "44fd7e89b5d4517c28f5a03b806373188426ee5f" +SRCREV = "f3367686f8139cfb4566d6df205ceff4d2c33463" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index df8e636b3..6f7951b9f 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -26,7 +26,7 @@ SYSTEMD_SERVICE_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "5592202fa6f28040518391c2ef2b7d55ce2da16b" +SRCREV = "551fafbce777ab0b5056c4934dea3e4477e7e911" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 8fff4874c..3d1598e66 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 = "638b43f50c3bda234a77bd8d3ccc2ea2b346a316" +SRCREV = "984a98f79022c60c51a465d4bbde1247d0f69b3e" diff --git a/meta-phosphor/recipes-phosphor/fans/files/Makefile b/meta-phosphor/recipes-phosphor/fans/files/Makefile deleted file mode 100644 index 10e3fa2ae..000000000 --- a/meta-phosphor/recipes-phosphor/fans/files/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -EXE = obmc-phosphor-fand -OBJS = $(EXE).o -DEPPKGS = gio-unix-2.0 glib-2.0 -CC ?= $(CROSS_COMPILE)gcc -INCLUDES += $(shell pkg-config --cflags $(DEPPKGS)) -LIBS += $(shell pkg-config --libs $(DEPPKGS)) - -%.o : %.c - $(CC) -c $^ $(CFLAGS) $(INCLUDES) -o $@ -$(EXE): $(OBJS) - $(CC) $^ $(LDFLAGS) $(LDFLAGS) -o $@ -clean: - rm -f $(OBJS) $(EXE) *.o *.d -distclean: clean - rm -f *.c~ *.h~ *.sh~ Makefile~ config.mk~ diff --git a/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c deleted file mode 100644 index 558ba10bc..000000000 --- a/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Contributors Listed Below - COPYRIGHT 2015 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ - -#include <stdio.h> -#include <stdlib.h> -#include <gio/gio.h> - -int main(int argc, char *argv[]) -{ - printf("obmc-phosphor-fand starting...\n"); - - while(1) - sleep(5); - - exit(EXIT_SUCCESS); -} diff --git a/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service deleted file mode 100644 index a7d0b4b22..000000000 --- a/meta-phosphor/recipes-phosphor/fans/files/obmc-phosphor-fand.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Fan Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-fand -SyslogIdentifier=obmc-phosphor-fand - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb deleted file mode 100644 index f7a3e051d..000000000 --- a/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Fan Management." -DESCRIPTION = "Phosphor OpenBMC fan management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit pkgconfig -inherit obmc-phosphor-sdbus-service -inherit obmc-phosphor-c-daemon - -PROVIDES += "virtual/obmc-fan-mgmt" -RPROVIDES_${PN} += "virtual-obmc-fan-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://Makefile \ - file://obmc-phosphor-fand.c \ - " diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index fe482caa1..ef9bee546 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 = "f24d7749b3c65af3b76039fce729fe4ae278b892" +SRCREV = "5e7298c58039b544ca917c27a01566fc28b18f0e" 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 67bf6cca0..0f0c0a95b 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "298a95cbb192ecc678b1a496acc954a3b2adf450" +SRCREV = "e30916c9ef6d363328b95c9947ac95d94a2b6a24" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if diff --git a/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py deleted file mode 100644 index 5e5dd8f36..000000000 --- a/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-flashd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service deleted file mode 100644 index 26959196e..000000000 --- a/meta-phosphor/recipes-phosphor/flash/files/obmc-phosphor-flashd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Flash Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-flashd -SyslogIdentifier=obmc-phosphor-flashd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb new file mode 100644 index 000000000..fb1480fb1 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "phosphor-ipmi-flash config to update without verifying the image" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit systemd + +SRC_URI += "file://noverify-bmc-verify.service" +SRC_URI += "file://config-bmc.json" + +SYSTEMD_SERVICE_${PN} += "noverify-bmc-verify.service" +FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" + +do_install() { + install -d ${D}${datadir}/phosphor-ipmi-flash + install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/noverify-bmc-verify.service ${D}${systemd_system_unitdir} +} diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/config-bmc.json b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/config-bmc.json new file mode 100644 index 000000000..86afb3ba3 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/config-bmc.json @@ -0,0 +1,20 @@ +[{ + "blob": "/flash/image", + "handler": { + "type": "file", + "path": "/run/initramfs/bmc-image" + }, + "actions": { + "preparation": { + "type": "skip" + }, + "verification": { + "type": "systemd", + "unit": "noverify-bmc-verify.service" + }, + "update": { + "type": "systemd", + "unit": "reboot.target" + } + } +}] diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/noverify-bmc-verify.service b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/noverify-bmc-verify.service new file mode 100644 index 000000000..50855b6b2 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update/noverify-bmc-verify.service @@ -0,0 +1,6 @@ +[Unit] +Description=Don't verify the image, just stage it for update + +[Service] +Type=oneshot +ExecStart=/bin/mv /run/initramfs/bmc-image /run/initramfs/image-bmc diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb deleted file mode 100644 index 92871502f..000000000 --- a/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Flash Management" -DESCRIPTION = "Phosphor OpenBMC flash management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-flash-mgmt" -RPROVIDES_${PN} += "virtual-obmc-flash-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${BPN}.py" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index fd7fc206e..8bc566ff4 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "1bb6dcb4a1ea8dca818d17fec834aa9e2482c4b4" +SRCREV = "0d7198f4eb6d36968e854b3246e6568305fdcc7b" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 301e4e788..d83945ea4 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -72,7 +72,10 @@ DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service" SYSTEMD_SERVICE_${PN}-updater += " \ + force-reboot.service \ obmc-flash-bmc-setenv@.service \ + reboot-guard-disable.service \ + reboot-guard-enable.service \ usr-local.mount \ " diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 8bb8f6408..c858d5b4b 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -6,13 +6,13 @@ PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit autotools pkgconfig +inherit meson +inherit pkgconfig inherit systemd PACKAGECONFIG ?= "" -PACKAGECONFIG[7seg] = "--enable-7seg,--disable-7seg,,udev" +PACKAGECONFIG[7seg] = "-D7seg=enabled,-D7seg=disabled,,udev" -DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "66efa632e25854ed5fba0166fe5c3bdd6761f20b" +SRCREV = "bf002b46d5fb2f176fb22e48c6f1172bc970e17d" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" @@ -29,11 +29,9 @@ SERVICE_FILE = "lpcsnoop.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" -EXTRA_OECONF = " \ - SNOOP_DEVICE="${SNOOP_DEVICE}" \ - POST_CODE_BYTES="${POST_CODE_BYTES}" \ - SYSTEMD_TARGET="multi-user.target" \ -" +EXTRA_OEMESON += "-Dsnoop-device=${SNOOP_DEVICE}" +EXTRA_OEMESON += "-Dpost-code-bytes=${POST_CODE_BYTES}" +EXTRA_OEMESON += "-Dsystemd-target=multi-user.target" POSTCODE_SEVENSEG_DEVICE ?= "seven_seg_disp_val" SERVICE_FILE_7SEG = " \ diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 742f497d2..4dfbbcf27 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "2a5689a752d31a4a5758d3827c7ca6302bc0acc7" +SRCREV = "1bf712bcd6b8d06a5d412cdf03cdc05cb6d25901" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 512268742..ff9889d5b 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "ebff814fb7de90d78d424f4554d19c5de1af89db" +SRCREV = "55f9eae440c883a32d9dfbdf51c6035555476c50" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index 8f390f554..a6a8198d2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend @@ -23,6 +23,7 @@ FILES_${PN} += "/usr/share/misc/enterprise-numbers" do_compile_prepend() { # copy the SRC_URI version of enterprise-numbers # to the build dir to prevent a fetch + mkdir -p "${WORKDIR}/build" cp "${WORKDIR}/enterprise-numbers" "${WORKDIR}/build/enterprise-numbers" } diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index 38121e542..4d973f6e8 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -17,7 +17,7 @@ DEPENDS += "protobuf" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" -SRCREV = "e535a736efd8ef2088c57a91c387be7800674161" +SRCREV = "1a25e0d16ea5cb79d0942193bed92ac7dd287112" 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-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 55bac7d77..7d62fc7fc 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 = "9cd8f76d3a786645ba6e21e146f66f5f27a6290c" +SRCREV = "03fd5b8b9e8fc0eb7f77c1a170fd2c0018ab9e63" 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 85ccaf36a..5c8acc685 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -45,7 +45,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "c8445aaa291eb720a8698765421822dea265dba7" +SRCREV = "6f61af8fd125400d064715559cfffba92afaecf6" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service index 1486cace0..2fc30838a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service @@ -2,9 +2,10 @@ Description=Read %I EEPROM Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service +StartLimitBurst=10 [Service] -Restart=no +Restart=on-failure Type=oneshot EnvironmentFile={envfiledir}/obmc/eeproms/%I ExecStartPre={bindir}/of-name-to-eeprom.sh {envfiledir}/obmc/eeproms/%I diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index c0909c94c..8a2e98f91 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 = "074f64d42d7fa7538d320ab1f0c91e641641a961" +SRCREV = "3dc3558944da95b8b288fa1afc3aaa96d273383d" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example_git.bb deleted file mode 100644 index a9e070c7b..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-hw-example_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Phosphor OpenBMC host IPMI to DBUS Example" -DESCRIPTION = "Phosphor OpenBMC host IPMI to DBUS example implementation." -PR = "r1" -PV = "1.0+git${SRCPV}" - -RDEPENDS_${PN} += "python-subprocess python-dbus python-pygobject" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" - -inherit skeleton-python - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" - -SKELETON_DIR = "pyipmitest" 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 6b0d4da90..b622f833e 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 = "a6ad5e161e5e5db4258b04254b19796f154b8533" +SRCREV = "9d9b7638cb1e95989329680730ec272da786615f" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index a74ffd121..7b7790272 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "4f43f5e48bb593c8ca806abd1f4029dc7479d216" +SRCREV = "d02c3cb424653592daade4419b53ee52c1105c03" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 6707707b5..750a6dff1 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "638b43f50c3bda234a77bd8d3ccc2ea2b346a316" +SRCREV = "984a98f79022c60c51a465d4bbde1247d0f69b3e" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 58b0034f4..24749c027 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -37,4 +37,4 @@ EXTRA_OECONF = "HOST_TTY=${OBMC_CONSOLE_HOST_TTY} \ # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" -SRCREV = "b8cf26fe933c7f020f5195b9575f596b9cb23719" +SRCREV = "ea31658b6df1c51b28ed28e3e459a64fb8d13da8" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7140ad7f4..7e36d7871 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -56,7 +56,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "d03d3d91bc39dcae72d07cd59ecbcbe530a7a9ed" +SRCREV = "0649b985860f7e0dc75e044f4b7598b767c94a9f" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 71dc00fa3..fdccf1f1b 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "85c11b9b5dadd5907a268694fd9efcaeef22481d" +SRCREV = "e5d90c3575a832b971c8139bcb016a444a0336fb" DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 640bcb89f..60a42814b 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "6f4e9040f6dd7cd05cba920170ac24771a5b7bc4" +SRCREV = "fd972645a84b3cc9454c680b2f9cdb758a2fe55c" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 96e09db97..c7c0a9485 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "84807b96facd36d4fbf93c16fe1f6ee9988dc4cf" +SRCREV = "89283d10ec148cdcdf14738bfe5991866d0a3cf8" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index cf853d254..8c68d91e0 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -41,6 +41,7 @@ DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ + boost \ " SEQ_MONITOR_SVC = "pseq-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index 07c7d0d9c..14cf6ac01 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt" -SRCREV = "f356fdc926f654063bcabd4509112282ef3d4dd0" +SRCREV = "bfa8d16f364ca16bd0c8101ad285bd78bd54d751" SUMMARY = "Phosphor PSU software manager" DESCRIPTION = "Providing PSU firmware version and upgrade" 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 0c078574f..e09f3ffe8 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 = "151b7c1fc62971b7d319146e5ea129d44eadd9d7" +SRCREV = "761bf202ba9db9fe644f8f400a5e768abe1a70cf" 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 c7757be16..dc78f4f68 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 = "10306bd5032fda014628487665d8000c0db49177" +SRCREV = "38fb598381a9fc7c4e2bbd7b585f788d0c7353e5" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 3207df4dc..5ccf99cac 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -18,6 +18,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += " \ sdbusplus \ sdeventplus \ + stdplus \ phosphor-dbus-interfaces \ phosphor-logging \ gpioplus \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 3ba8c4a7a..9edd32223 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "e41b2e4c6c579f451b8d01ffff7abc46f0f7c6b2" +SRCREV = "05eedaa80eef276b6ecee9d4fb721a523d2d999c" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml index 3541fdb49..25458155f 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml @@ -52,12 +52,6 @@ PowerRestorePolicy: Default: RestorePolicy::Policy::AlwaysOff -/xyz/openbmc_project/time/owner: - - Interface: xyz.openbmc_project.Time.Owner - Properties: - TimeOwner: - Default: Owner::Owners::Both - /xyz/openbmc_project/time/sync_method: - Interface: xyz.openbmc_project.Time.Synchronization Properties: diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc index d08273e38..e51bb408c 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-settingsd" -SRCREV = "6f62cc844b3e9f356e8ee79af256c41069a57140" +SRCREV = "8f5c256647714dee8b67836ee24b8dff89b4ae46" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index d5b73beae..96c0e9ac4 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "993d4dd9dc583e62a84c6056edffad957d7b7b5d" +SRCREV = "9d91a39a3a760358a4c1a5e89fb5ef57d1bd7995" 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 f94b8758b..5501986bd 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -266,6 +266,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "dc059399bca5d459fb82b6a28e7f547745a251a1" +SRCREV = "42f2898d182b66ff0523482120013de62d573645" 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 5e1c05c7b..b687e9e5c 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -36,5 +36,5 @@ DBUS_SERVICE_phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "fe720ffacd180f866fbeb7ef8d3a5f243b328ccd" +SRCREV = "73ce773e2f94fcfdeeeb9db83a3e92429ab4a663" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 6d74e84a4..b3ecb84f2 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "f2b3e6c1ef4909f523477c1f839be05eea3e4604" +SRCREV = "396aaab761da86698dcb5890b0a6960a90d3459b" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 7dd149e81..cb1daba0b 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "fc1ecc59100d21c953501703bc5db9e02e25b333" +SRCREV = "b0c613aa889136610811d5f44a172081731db216" PV = "1.0+git${SRCPV}" @@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit cmake systemd -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service \ + chassis-system-reset.service \ + chassis-system-reset.target" DEPENDS += " \ boost \ |