diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
40 files changed, 91 insertions, 109 deletions
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service index c97b67bac..092409e40 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service @@ -14,8 +14,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/env pgood_wait /org/openbmc/control/power%i off SyslogIdentifier=pgood_wait -ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on -ExecStart=/bin/rm -f /run/openbmc/host@%i-on ExecStart=/bin/rm -f /run/openbmc/host@%i-request ExecStart=/bin/rm -f /run/openbmc/mpreboot@%i diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 9ce85a914..f6a6eae47 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 file://blocklist.json" -SRCREV = "e789bf12a49a8993c7d9b7a161494b58dab2dcf0" +SRCREV = "9fd87e54f5a65f3103b996114e052470dd1afd03" 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 195b276df..4b6abb5a2 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -36,7 +36,7 @@ SYSTEMD_SERVICE_${PN} += "obmc-console-ssh@.service \ obmc-console@.service \ " -FILES_${PN} += "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" +FILES_${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" do_install_append() { # Install the server configuration 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 252b2fab5..dbe32cc89 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 = "8af2a8940992c00417cf6629997c528f2500efbf" +SRCREV = "7252bea64c7f3b03c4d80bb449f82f05a30baa71" 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 0efdc51a8..86467f6a1 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "ae956ad9efd2be24c5439a4ef6498fb5c8383719" +SRCREV = "32fbd5df095c9b0262a013bedae8cef51f1d35fe" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index daa224141..01aa6b3f7 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 = "bb40bd36854dde1eb466a2bf093351496ce458bb" +SRCREV = "2b7789c0180e9678909407df2c195dd3191dfc68" 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 98b4cf063..b9d04f800 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 = "4c63ce5e2e507a0642e25d3e769ee8cb8638fbfe" +SRCREV = "0af74a5e46bfc1b2014cfe54261b2a9926a7cecc" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 9f672d15d..135e0f6f8 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 = "1d7379ea2264700ec4f9711ceac6ca113f9cb5d8" +SRCREV = "a3584bd2559e291cf329ff6b4f179ad92b7aeaa0" 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 7c977c513..f4ca8b075 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "7a8d5a170004c9256e00ab4a605ebba5437921dd" +SRCREV = "e39bbe9f03177f1653b33d1ccaf8b2bd0a3f89c6" # 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/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 7eb09472e..2f57adae7 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 = "1fd6dddf7d8203b04a0ff9878f74bc07ffdc0a1e" +SRCREV = "6e9fb1d6ec428d1cc05c78b9b394b214b46c0364" diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 092f02a6d..5220431d5 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -44,5 +44,5 @@ FILES_${PN}-monitor += "${base_libdir}/udev/rules.d/99-gpio-keys.rules" FILES_${PN}-presence += "${bindir}/phosphor-gpio-presence" SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" -SRCREV = "3ce88a7b5a1c17ca53b63859a5dad840a995f42e" +SRCREV = "b08a0f691740ef21e28547a57981b1043d46d8ce" S = "${WORKDIR}/git" 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 4ea8bdff4..77d36bbf1 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "ba5258f7158e8a0e61043290aff0873358509158" +SRCREV = "2a744b2d70ce9de8519a7c716da5009cb049db17" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb/run-ptest b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/run-ptest new file mode 100644 index 000000000..f2a522a14 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls test/*_test`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d13af80a4..0e0abb236 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,10 +13,16 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "d8ef9915dda4d2e3b7aec885ebfa7debce61bff8" +SRCREV = "1a6258dc985cde406d9098130e4a2d683e82beb2" S = "${WORKDIR}/git" +inherit meson ptest + +SRC_URI += " \ + file://run-ptest \ +" + DEPENDS = " \ openssl \ zlib \ @@ -27,6 +33,8 @@ DEPENDS = " \ gtest \ nlohmann-json \ libtinyxml2 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " RDEPENDS_${PN} += " \ @@ -34,11 +42,19 @@ RDEPENDS_${PN} += " \ phosphor-mapper \ " +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/*_test ${D}${PTEST_PATH}/test/ +} + FILES_${PN} += "${datadir}/** " -inherit meson -EXTRA_OEMESON = "--buildtype=minsize -Dtests=disabled -Dyocto-deps=enabled" +EXTRA_OEMESON = " \ + --buildtype=minsize \ + -Dtests=${@bb.utils.contains('PTEST_ENABLED', '1', 'enabled', 'disabled', d)} \ + -Dyocto-deps=enabled \ +" SYSTEMD_SERVICE_${PN} += "bmcweb.service bmcweb.socket" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 6a8602758..79b0fd9fc 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 = "59521e87de8d3d74065628393bbadc4389e09600" +SRCREV = "ffa2b7ec19d7721295e8a05d202c7c0ca38a912f" 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 227e8c897..bac96c456 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 = "485e54aea3f7b084b4425d83d2f5eb9529c09ebe" +SRCREV = "a533a3756f084ab6c5a80375074178440ba7c905" 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 b523697fc..67a8aa45e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -36,6 +36,8 @@ PACKAGECONFIG[host-bios] = "--enable-host-bios, --disable-host-bios" 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" +PACKAGECONFIG[nuvoton-p2a-vga] = "--enable-nuvoton-p2a-vga, --disable-nuvoton-p2a-vga" +PACKAGECONFIG[nuvoton-p2a-mbox] = "--enable-nuvoton-p2a-mbox, --disable-nuvoton-p2a-mbox" PACKAGECONFIG[net-bridge] = "--enable-net-bridge, --disable-net-bridge" EXTRA_OECONF = "--disable-tests --disable-build-host-tool" @@ -46,7 +48,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "c7fa2c2803065fcae3e9540e57d2a28a5bc83ecc" +SRCREV = "a3f65698000d366b57d2916eae67518f89c1298b" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index ef91bb9e9..fc26d1a7e 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 = "0968237b479d649ecaac7561cf07fbacf241d98c" +SRCREV = "472d3e2fd7f2409cbe88e23128b46d6f4d982af3" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 9ea92101d..51d2da791 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 = "be0632321e2a0f4fbe7b0e9c1403121c4db37328" +SRCREV = "916d4232a432b9f9ee5ddd3d0bbce05c1f3909f6" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index a4d4b4bb2..a684c4807 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -12,8 +12,8 @@ PV = "1.0+git${SRCPV}" KCS_DEVICE ?= "ipmi-kcs3" -SYSTEMD_SERVICE_${PN} = " ${PN}@${KCS_DEVICE}.service " -FILES_${PN} += " ${systemd_system_unitdir}/${PN}@.service " +SYSTEMD_SERVICE_${PN} = "${PN}@${KCS_DEVICE}.service" +FILES_${PN} += "${systemd_system_unitdir}/${PN}@.service" PROVIDES += "virtual/obmc-host-ipmi-hw" RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" 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 b18ea0136..8db745ecc 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -18,7 +18,7 @@ DEPENDS += "phosphor-ipmi-host" RRECOMMENDS_${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "07bb095158b39cedb49dae0972e489a6a2776faf" +SRCREV = "d4a4bed525f79c39705fa526b20ab663bb2c2069" 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 3e94ccc35..d296166c1 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 = "616a0716970203cb77dc92301f0763043c5b461c" +SRCREV = "c105f279ebf2de11ca3941559c91c53e43bc646f" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 55171dbed..cce6fdef0 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -3,22 +3,19 @@ DESCRIPTION = "Daemon to cater to triggering actions on LED groups" PR = "r1" PV = "1.0+git${SRCPV}" -require ${BPN}.inc +require ${PN}.inc -inherit autotools pkgconfig python3native +inherit meson pkgconfig python3native inherit obmc-phosphor-dbus-service obmc-phosphor-systemd -LED_MGR_PACKAGES = " \ - ${PN}-ledmanager \ - ${PN}-faultmonitor \ -" +PACKAGECONFIG ??= "" +PACKAGECONFIG[use-json] = "-Duse-json=enabled, -Duse-json=disabled" +PACKAGECONFIG[use-lamp-test] = "-Duse-lamp-test=enabled, -Duse-lamp-test=disabled" +PACKAGECONFIG[monitor-operational-status] = "-Dmonitor-operational-status=enabled, \ + -Dmonitor-operational-status=disabled" -PACKAGE_BEFORE_PN += "${LED_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${PN}-ledmanager" - -SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}" +SYSTEMD_PACKAGES = "${PN} ${PN}-faultmonitor" +PACKAGE_BEFORE_PN += "${PN}-faultmonitor" DEPENDS += "${PYTHON_PN}-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" @@ -31,28 +28,27 @@ DEPENDS += "nlohmann-json" DEPENDS += "virtual/${PN}-config-native" -RDEPENDS_${PN}-ledmanager += "bash" +RDEPENDS_${PN} += "bash" S = "${WORKDIR}/git" -FILES_${PN}-ledmanager += "${bindir}/phosphor-ledmanager ${bindir}/led-set-all-groups-asserted.sh" FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" -DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service" +DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service" -SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service" +SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" STATES = "start stop" TMPLFMT = "obmc-led-group-{0}@.service" TGTFMT = "obmc-power-{0}@0.target" INSTFMT = "obmc-led-group-{0}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}-ledmanager += "${@compose_list(d, 'FMT', 'STATES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN}-ledmanager += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" 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 c3768c9d9..03cdb9636 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -19,7 +19,7 @@ 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 = "61b906367119b794a9788725fad86a3174bd83c0" +SRCREV = "a8a275f635ff876186ce5783308e93368f205898" S = "${WORKDIR}/git" do_install_append() { diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 8816f1ab6..2ad8b50ef 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -22,7 +22,7 @@ RRECOMMENDS_${PN} += "phosphor-debug-collector" # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" -SRCREV = "e9af83c6f5cc14a7493de5359b3c65b8832c99f0" +SRCREV = "dfee0da0a855933a3d61df5d190d19d82a72bed7" # Systemd service template SYSTEMD_PACKAGES = "${PN}" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 2bc141bb5..5fa7f7a03 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -24,14 +24,11 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "virtual/phosphor-logging-callouts" DEPENDS += "libcereal" DEPENDS += "sdeventplus" -DEPENDS_append_class-target = " packagegroup-obmc-yaml-providers" +DEPENDS += "packagegroup-obmc-yaml-providers" PACKAGE_BEFORE_PN = "${PN}-test" FILES_${PN}-test = "${bindir}/*-test" -PACKAGE_BEFORE_PN += "${PN}-elog" -FILES_${PN}-elog += "${elog_dir}" - # Package configuration LOGGING_PACKAGES = " \ ${PN}-base \ @@ -55,61 +52,25 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "25d986c1e7d749d3f78da5a5e507d1f2bcbc7874" +SRCREV = "6b3f345b3f265036ec339d097f9d60d12998015d" S = "${WORKDIR}/git" -# Do not DEPEND on the specified packages for native build -# as they will not be available in host machine -DEPENDS_remove_class-native = " \ - virtual/phosphor-logging-callouts \ - sdbusplus \ - systemd \ - libcereal \ - sdeventplus \ - " - -# Do not DEPEND on the specified packages for native SDK build -# as they will not be available in host machine -DEPENDS_remove_class-nativesdk = " \ - virtual/phosphor-logging-callouts \ - sdbusplus \ - libcereal \ - systemd \ - phosphor-dbus-interfaces \ - sdeventplus \ - " - -PACKAGECONFIG ??= "metadata-processing install_scripts" +PACKAGECONFIG ??= "metadata-processing" PACKAGECONFIG[metadata-processing] = " \ --enable-metadata-processing, \ --disable-metadata-processing, , \ " -# Provide a means to enable/disable install_scripts feature -PACKAGECONFIG[install_scripts] = " \ - --enable-install_scripts, \ - --disable-install_scripts, ,\ - " - PACKAGECONFIG[openpower-pels] = " \ --enable-openpower-pel-extension, \ --disable-openpower-pel-extension, \ - nlohmann-json nlohmann-fifo cli11 pldm, \ + nlohmann-json cli11 pldm, \ python3, \ " -# Enable install_scripts during native and native SDK build -PACKAGECONFIG_add_class-native = "install_scripts" -PACKAGECONFIG_add_class-nativesdk = "install_scripts" - -# Disable install_scripts during target build -PACKAGECONFIG_remove_class-target = "install_scripts" - EXTRA_OECONF = " \ YAML_DIR=${STAGING_DIR_TARGET}${yaml_dir} \ CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ " - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb index 685e2369f..ff3c098a9 100644 --- a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb +++ b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "e889b19f4b349cd5c4ff186ff3c3b604c8f9c7b6" +SRCREV = "eba19a3b122a39ef2b5dbda49b418a202f78a48d" CONFFILES_${PN} = "${sysconfdir}/default/mctp" DEPENDS += "autoconf-archive-native \ diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index f3c46b069..3f21adc20 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 = "bcabadac18a072cecce76b0e7038f2978f9025b1" +SRCREV = "a1d27606bc7da14081770ca310012768b933f6e7" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 47b5b467c..f0ab969aa 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 = "81d6cde458c554c6cc71793eb0ed38edc58043a6" +SRCREV = "e2f14a5748e2bedc926bdd7a855ff4fb368ae1a5" 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 c52e8e149..d1f37c275 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 = "aaffc124b6f49d9bc267e65565bdd5d4c1db1aaf" +SRCREV = "486e42e9db215070d631b7ac1f8f32537cb3bfe7" 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 8302675e8..e3ab1f339 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 = "d05867c0d32065d36b13bd452f7aff9dcb20ac2f" +SRCREV = "eb0b84de9fd39a74a4a67990de6054b9d9f49833" 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 a5c1db49a..4e90977b4 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -5,14 +5,11 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-systemd PACKAGECONFIG ??= "" -# Autotools configure option to enable/disable max31785-msl -PACKAGECONFIG[max31785-msl] = "--enable-max31785-msl, --disable-max31785-msl" -# Meson configure option to enable/disable max31785-msl -# PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" +PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" PACKAGE_BEFORE_PN = "max31785-msl" SYSTEMD_PACKAGES = "${PN} max31785-msl" @@ -39,14 +36,14 @@ RDEPENDS_${PN} += "\ RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" FILES_max31785-msl = "${bindir}/max31785-msl" -RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools" +RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" SRC_URI += "git://github.com/openbmc/phosphor-hwmon" SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "82921ae8e84b250e6436c8c005245bccd5c4706c" +SRCREV = "73769099e215de68fbb6c82664eb682cacce9f56" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 26c674c0a..fb4035406 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 = "93455337cbf9b005e761c15bd90bdbe6b13484b8" +SRCREV = "fdffe5c37f0d1feaa90558433f688c3757d2e79a" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 68c9f74d5..3eee4dbaa 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "2b56ddb38d7446281c18786b5e280ae30f5f7b35" +SRCREV = "a55a907e7220bede5f4c76ca6d99fad2a0c1f00d" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" 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 699c3e1db..43de0fdb4 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 = "84a4c19c48ad28b537cfcce15df39e841e1ed565" +SRCREV = "0171dd6bce9004e187c957f160809b729322f37d" 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 de7e5d894..e93f12f7b 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -55,6 +55,8 @@ DEPENDS += "libcereal" DEPENDS += "nlohmann-json" DEPENDS += "cli11" +RDEPENDS_${PN}-chassis += "bash" + FILES_${PN}-host = "${bindir}/phosphor-host-state-manager" DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" @@ -180,6 +182,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 = "35ca2e34cd04b7288a5b659e4e7dcd4590056b7d" +SRCREV = "aaa2e11057d89feadba173a6fea70325102cce21" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 5986cf052..d255f5731 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "9f9ff90a39219ff3a2f1179f74fc9a6dc857e5ab" +SRCREV = "f763c9e3bbe0f86a4a41e7bb0dc70bffde0af9b2" 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 903678f4f..3708e67ce 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 = "9638afb9aa848aa0e696c2447e0fbc70a0aa5eed" +SRCREV = "18c1b42c1612e0e8d8f5cd9973bba09b447c7185" 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 6215f609b..7f327d152 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 = "086837596cdaffd27b399a863775e68cf8f2f344" +SRCREV = "18d3e6525cf412af8b940ad1f8e70afd7e907980" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index f03efc473..481f7b6cc 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 = "7006806d21cf8d13666524a8124b8395f2f1e156" +SRCREV = "5ed21f2d1e8b82be699a623bfdef550dfd598dbb" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " |