diff options
| author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-09-05 05:03:36 +0300 |
|---|---|---|
| committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-09-05 05:03:36 +0300 |
| commit | d52323bd2ea9240ed1f30563197dff969ca03059 (patch) | |
| tree | 6eca8fc04a141f129c6e7cd4599516aa8165389c /meta-phosphor | |
| parent | 549c3eeb0117c3cf10cfcfb76f120c60811603f3 (diff) | |
| parent | 6e1e5d60d936ccfaf5505e7f2d8d5aad3056188e (diff) | |
| download | openbmc-d52323bd2ea9240ed1f30563197dff969ca03059.tar.xz | |
Reabse by merge to ibs@6e1e5d60d936ccfaf5505e7f2d8d5aad3056188e
Diffstat (limited to 'meta-phosphor')
88 files changed, 273 insertions, 186 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index e522783168..fb31e259e0 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -509,7 +509,7 @@ python do_generate_phosphor_manifest() { version = do_get_version(d) build_id = do_get_buildID(d) target_machine = d.getVar('MACHINE', True) - extended_version = d.getVar('EXTENDED_VERSION', True) + extended_version = do_get_extended_version(d) compatible_names = d.getVar('OBMC_COMPATIBLE_NAMES', True) with open('MANIFEST', 'w') as fd: fd.write('purpose={}\n'.format(purpose)) diff --git a/meta-phosphor/classes/image_version.bbclass b/meta-phosphor/classes/image_version.bbclass index 17f324e2e4..e10bcd7cd8 100644 --- a/meta-phosphor/classes/image_version.bbclass +++ b/meta-phosphor/classes/image_version.bbclass @@ -2,22 +2,26 @@ DEPENDS:append = " os-release" -def do_get_version(d): +def do_get_os_release_value(d, key): import configparser import io path = d.getVar('STAGING_DIR_TARGET', True) + d.getVar('sysconfdir', True) path = os.path.join(path, 'os-release') parser = configparser.ConfigParser(strict=False) parser.optionxform = str - version = '' + value = '' try: with open(path, 'r') as fd: buf = '[root]\n' + fd.read() fd = io.StringIO(buf) parser.readfp(fd) - version = parser['root']['VERSION_ID'] + value = parser['root'][key] except: pass + return value + +def do_get_version(d): + version = do_get_os_release_value(d, 'VERSION_ID') return version def do_get_versionID(d): @@ -28,19 +32,9 @@ def do_get_versionID(d): return version_id def do_get_buildID(d): - import configparser - import io - path = d.getVar('STAGING_DIR_TARGET', True) + d.getVar('sysconfdir', True) - path = os.path.join(path, 'os-release') - parser = configparser.ConfigParser(strict=False) - parser.optionxform = str - build_id = '' - try: - with open(path, 'r') as fd: - buf = '[root]\n' + fd.read() - fd = io.StringIO(buf) - parser.readfp(fd) - build_id = parser['root']['BUILD_ID'] - except: - pass + build_id = do_get_os_release_value(d, 'BUILD_ID') return build_id + +def do_get_extended_version(d): + extended_version = do_get_os_release_value(d, 'EXTENDED_VERSION') + return extended_version diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass index 5a5b33c13e..83c4d27c49 100644 --- a/meta-phosphor/classes/mrw-rev.bbclass +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -2,4 +2,4 @@ MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git;branch=master;prot MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42" MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools;branch=master;protocol=https" -MRW_TOOLS_SRCREV ?= "721dcbd23da4f9679ddf58119c478922bf420a1e" +MRW_TOOLS_SRCREV ?= "b4edc27a3c25cf78c6eeb06f5e45c3b379da445d" diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index 8e98df20e2..dfa3889b71 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,4 +1,4 @@ -SRCREV ?= "77b241c472efc5af618a839493aa8357544ea213" +SRCREV ?= "f81f0e5659e7a9eb0069a8293d208f1a4b3f922b" SKELETON_URI ?= "git://github.com/openbmc/skeleton;branch=master;protocol=https" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" diff --git a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb index 6cf09350d9..75a1efecfb 100644 --- a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb +++ b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "nbd-client" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/jsnbd;branch=master;protocol=https" -SRCREV = "7b7c29369cfeb267efa7f45b271aca6910687461" +SRCREV = "3ebe3dadd3f550d20080c8bb14dee113e322eb61" NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" diff --git a/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg b/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg index 99e83dbd93..28ff4363c9 100644 --- a/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg +++ b/meta-phosphor/recipes-core/busybox/busybox/busybox.cfg @@ -4,3 +4,4 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y CONFIG_WATCHDOG=y CONFIG_EXPAND=y +CONFIG_WGET=n diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index c1dda480ff..50c3787e4a 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -25,6 +25,7 @@ def run_git(d, cmd): # indirection via PHOSPHOR_OS_RELEASE_DISTRO_VERSION. PHOSPHOR_OS_RELEASE_DISTRO_VERSION := "${@run_git(d, 'describe --dirty')}" DISTRO_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" +EXTENDED_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 074dced6c0..fb73ca15a7 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -1,5 +1,7 @@ -FILES:${PN}-catalog-extralocales = \ - "${exec_prefix}/lib/systemd/catalog/*.*.catalog" +FILES:${PN}-catalog-extralocales = "\ + ${exec_prefix}/lib/systemd/catalog/*.*.catalog \ +" + PACKAGES =+ "${PN}-catalog-extralocales" PACKAGECONFIG = "\ coredump \ diff --git a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend index e921c809c7..8502a0af13 100644 --- a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend +++ b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend @@ -1,6 +1,7 @@ -EXTRA_OECONF:append:class-target = " --disable-largefile --disable-locale \ - --disable-iconv --without-included-popt \ - --without-included-zlib" +EXTRA_OECONF:append:class-target = " \ + --disable-locale --disable-iconv \ + --without-included-popt --without-included-zlib \ +" PACKAGECONFIG = "" diff --git a/meta-phosphor/recipes-extended/libbej/libbej_git.bb b/meta-phosphor/recipes-extended/libbej/libbej_git.bb new file mode 100644 index 0000000000..858534999e --- /dev/null +++ b/meta-phosphor/recipes-extended/libbej/libbej_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "Binary Encoded JSON library" +DESCRIPTION = "Used to decode Redfish Device Enablement (RDE) BEJ" +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" + +SRC_URI += "git://github.com/openbmc/libbej;branch=main;protocol=https" +SRCREV = "cc4098e1508eede5887724fc68119a5e12fc3f96" + +S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index bca1dbbec8..ee362a6f75 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;branch=master;protocol=https" -SRCREV = "08be868a6d18bca99d3580f4b3247c0c953f0f84" +SRCREV = "c971bebca35d9f697a7a9e3efae3c66867e5b68d" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index a4986a4aaf..8a739afda5 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV ?= "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus;branch=master;protocol=https" -SRCREV = "b7329a90eef04a24c03a2afef43c2145a0033ae6" +SRCREV = "cff540a986657840d02a69e83ab133fba46988b6" diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index d61a008379..3b9d266607 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/sdeventplus;branch=master;protocol=https" -SRCREV = "02316409089ce12fa7c188f316469be8681b850b" +SRCREV = "13afebfaa6a2bbb0bc03f4382eb6ba1c50fa6d4d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index b0edf3a4c4..8308dc1d27 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -13,12 +13,18 @@ DEPENDS += " \ liburing \ " +PACKAGES =+ "libstdplus libstdplus-dl libstdplus-io_uring" +FILES:libstdplus = "${libdir}/libstdplus.so.*" +FILES:libstdplus-dl = "${libdir}/libstdplus-dl.so.*" +FILES:libstdplus-io_uring = "${libdir}/libstdplus-io_uring.so.*" + EXTRA_OEMESON = " \ -Dexamples=false \ -Dtests=disabled \ + -Dgtest=disabled \ " SRC_URI += "git://github.com/openbmc/stdplus;branch=master;protocol=https" -SRCREV = "891e6a3d7ae4158444f0c2b32398f121b5ff14a9" +SRCREV = "aa4fcfc208c45511aa9788a08c969425e440fda0" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/wget/wget_%.bbappend b/meta-phosphor/recipes-extended/wget/wget_%.bbappend new file mode 100644 index 0000000000..05096efa93 --- /dev/null +++ b/meta-phosphor/recipes-extended/wget/wget_%.bbappend @@ -0,0 +1,2 @@ +PACKAGECONFIG:remove:openbmc-phosphor = "gnutls" +PACKAGECONFIG:append:openbmc-phosphor = " openssl" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 8f0423b134..404ffda7ad 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -8,7 +8,7 @@ WARN_QA:remove = " obsolete-license" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" -SRCREV = "3fa0bfbab1352b7fa907ae8b0199bd16b6e5d425" +SRCREV = "f79f6f540b846e7e25627265f5bbffef13034873" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index 510d79b654..af8c6091cd 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -13,7 +13,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/openbmc/bios-settings-mgr;branch=master;protocol=https" -SRCREV = "616f9228daa5b94447c3c9d519b63f1686e751f5" +SRCREV = "36cd3238d75c5f3479a944a2f1a9a3abc316120a" inherit meson pkgconfig systemd @@ -22,6 +22,7 @@ SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.biosconfig_manager.service \ xyz.openbmc_project.biosconfig_password.service" DEPENDS = " boost \ + openssl \ phosphor-dbus-interfaces \ phosphor-logging \ sdbusplus \ 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 7b4541d18d..d27f9d9861 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;branch=master;protocol=https" -SRCREV = "ebd21ba4fc36577a70cad207e42d66594b73ed13" +SRCREV = "b3dbfb37a6624153d5c27d87fc07d95e36bef352" inherit meson pkgconfig systemd 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 58fe57be6d..651d51b7cb 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git;branch=master;protocol=https" -SRCREV = "3bd1cfcb7d8293b1694aebb7f0e47fd53f7a5f60" +SRCREV = "a6d4e65d5c4c78f86d690fff31b79db9fa8c3b4c" -inherit cmake pkgconfig systemd +inherit meson pkgconfig systemd BUTTON_PACKAGES="${PN}-signals ${PN}-handler" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb index cea4102cc4..bc42b9495b 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb @@ -5,9 +5,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit autotools pkgconfig +inherit meson pkgconfig -DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" DEPENDS += "gpioplus" @@ -15,4 +14,4 @@ DEPENDS += "gpioplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-power-control;branch=master;protocol=https" -SRCREV = "ca9aa00180423b548369a7485bbca641581cc1ab" +SRCREV = "09fdcb592a9320b9363fb1c7fec872a69ac95189" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 7bae16a37f..eebffdd3e3 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -5,7 +5,7 @@ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git;branch=master;protocol=https \ file://blocklist.json \ " -SRCREV = "14a7bc9303d747dbc20cb702083e7af0a3cf0496" +SRCREV = "53f84ca26e949115d805d4f2834347df3238145e" 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 714e1e5082..64bcafc4e2 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -26,7 +26,7 @@ DEPENDS += "autoconf-archive-native \ SRC_URI += "git://github.com/openbmc/obmc-console;branch=master;protocol=https" SRC_URI += "file://${BPN}.conf" -SRCREV = "93fd8a39d8d20cdf965490f594a2d6f6d90f506c" +SRCREV = "bbc95526c6b612ec42f45e3d554d01324477c4e7" PV = "1.0+git${SRCPV}" REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" 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 3e43cdaea7..0ce4024dbe 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;branch=master;protocol=https" -SRCREV = "076f9ecef94b5329cc0361352e7af30851010e73" +SRCREV = "cb421097442f2e4ba92b88d2fb9cd94b618ce318" 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 9e4a99c972..f79d468a57 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;branch=master;protocol=https" -SRCREV = "c6cf37a77b2d7ed93d8bd006ba842289d3d1369a" +SRCREV = "9f2fee821a19da9382a4aee09d8b5079bd03b8e3" # 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-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index ecbc5bf568..2ca40fe5f0 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,9 +7,9 @@ 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;branch=master;protocol=https" -SRCREV = "2beffa634d4e899745510af4e8fa2c387ec5d3ad" +SRCREV = "04267b4ff02aeb9a7cc15676c38fd760575c53bd" -inherit autotools \ +inherit meson \ pkgconfig \ python3native \ phosphor-dbus-monitor \ @@ -22,7 +22,6 @@ SYSTEMD_SERVICE:phosphor-msl-verify = "phosphor-msl-verify.service" DEPENDS += " \ ${PN}-config \ phosphor-logging \ - autoconf-archive-native \ ${PYTHON_PN}-sdbus++-native \ sdeventplus \ gtest \ @@ -37,6 +36,6 @@ FILES:phosphor-msl-verify = "${bindir}/phosphor-msl-verify" S = "${WORKDIR}/git" -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_HOST}${config_dir} \ +EXTRA_OEMESON = " \ + -DYAML_PATH=${STAGING_DIR_HOST}${config_dir} \ " diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index c1eae05f1a..e1ca8aa89b 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -25,7 +25,7 @@ SYSTEMD_SERVICE:${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=https" -SRCREV = "af3d797b011f3f0dfc6ad7eae44e5b312f5a3d6e" +SRCREV = "ff46420f4c983726e3bba3a2afb1120206c3725c" 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 e97251eb20..bc86653057 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;branch=master;protocol=https" -SRCREV = "124d31f09cbb0eebd0f14aceade5c2fd290520fe" +SRCREV = "046640491721419f74274cc214ca3f28116f0448" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service index efb95c39ea..7ae5ed9fd9 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service @@ -1,6 +1,6 @@ [Unit] Description=Ramoops monitor. -ConditionPathExists=/var/lib/systemd/pstore +ConditionPathExistsGlob=/var/lib/systemd/pstore/dmesg-ramoops-* After=xyz.openbmc_project.Dump.Manager.service [Service] diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index fe8471271e..358b7a71c2 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;branch=master;protocol=https" -SRCREV = "a899aa0cbdb7904d177fc5bb85aa605e4ff13747" +SRCREV = "bb29bb7c6560946505160b0a03d2653bf67c38ee" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 28da7fe2d9..da2d6954f6 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -5,15 +5,13 @@ PR = "r1" PV = "1.0+git${SRCPV}" require ${BPN}.inc - -inherit autotools pkgconfig python3native +inherit meson pkgconfig python3native inherit obmc-phosphor-systemd inherit phosphor-fan S = "${WORKDIR}/git" # Common build dependencies -DEPENDS += "autoconf-archive-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "sdbusplus" @@ -30,24 +28,26 @@ FAN_PACKAGES = " \ ${PN}-presence-tach \ ${PN}-control \ ${PN}-monitor \ + ${PN}-sensor-monitor \ " ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" -PACKAGECONFIG ?= "presence control monitor" +PACKAGECONFIG ?= "presence control monitor sensor-monitor" SYSTEMD_PACKAGES = "${FAN_PACKAGES}" +EXTRA_OEMESON:append = " -Dtests=disabled" PKG_DEFAULT_MACHINE ??= "${MACHINE}" PACKAGE_ARCH = "${MACHINE_ARCH}" # The control, monitor, and presence apps can either be JSON or YAML driven. -PACKAGECONFIG[json] = "--enable-json, --disable-json" +PACKAGECONFIG[json] = "-Djson-config=enabled, -Djson-config=disabled" # -------------------------------------- # ${PN}-presence-tach specific configuration -PACKAGECONFIG[presence] = "--enable-presence \ - MACHINE=${PKG_DEFAULT_MACHINE} \ - PRESENCE_CONFIG=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ - --disable-presence, \ +PACKAGECONFIG[presence] = "-Dpresence-service=enabled \ + -Dmachine-name=${PKG_DEFAULT_MACHINE} \ + -Dpresence-config=${STAGING_DIR_HOST}${presence_datadir}/config.yaml, \ + -Dpresence-service=disabled, \ virtual/phosphor-fan-presence-config \ , \ " @@ -56,7 +56,7 @@ MULTI_USR_TGT = "multi-user.target" TMPL_TACH = "phosphor-fan-presence-tach@.service" INSTFMT_TACH = "phosphor-fan-presence-tach@{0}.service" POWERON_TGT = "obmc-chassis-poweron@{0}.target" -FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.requires/${INSTFMT_TACH}" +FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.wants/${INSTFMT_TACH}" FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" @@ -73,13 +73,13 @@ FILES:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ # -------------------------------------- # ${PN}-control specific configuration -PACKAGECONFIG[control] = "--enable-control \ - MACHINE=${PKG_DEFAULT_MACHINE} \ - FAN_DEF_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ - FAN_ZONE_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ - ZONE_EVENTS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml, \ - --disable-control, \ +PACKAGECONFIG[control] = "-Dcontrol-service=enabled \ + -Dmachine-name=${PKG_DEFAULT_MACHINE} \ + -Dfan-def-yaml-file=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ + -Dfan-zone-yaml-file=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ + -Dzone-events-yaml-file=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ + -Dzone-conditions-yaml-file=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml, \ + -Dcontrol-service=disabled, \ virtual/phosphor-fan-control-fan-config \ phosphor-fan-control-zone-config \ phosphor-fan-control-events-config \ @@ -119,10 +119,10 @@ FILES:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ # -------------------------------------- # ${PN}-monitor specific configuration -PACKAGECONFIG[monitor] = "--enable-monitor \ - MACHINE=${PKG_DEFAULT_MACHINE} \ - FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ - --disable-monitor, \ +PACKAGECONFIG[monitor] = "-Dmonitor-service=enabled \ + -Dmachine-name=${PKG_DEFAULT_MACHINE} \ + -Dfan-monitor-yaml-file=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ + -Dmonitor-service=disabled, \ phosphor-fan-monitor-config \ , \ " @@ -156,11 +156,12 @@ FILES:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ # -------------------------------------- # phosphor-cooling-type specific configuration -PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," - +PACKAGECONFIG[cooling-type] = "-Dcooling-type-service=enabled,-Dcooling-type-service=disabled,," # -------------------------------------- # ${PN}-sensor-monitor specific configuration -PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monitor" +PACKAGECONFIG[sensor-monitor] = "-Dsensor-monitor-service=enabled,-Dsensor-monitor-service=disabled" + +FAN_PACKAGES:append = "${@bb.utils.contains('PACKAGECONFIG', 'sensor-monitor', ' sensor-monitor', '', d)}" FILES:sensor-monitor += " ${bindir}/sensor-monitor" SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" 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 20f0260d27..b521d3209c 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;branch=master;protocol=https" -SRCREV = "ac3a21911e4f6b796310a510299bafe6e46b5afb" +SRCREV = "bcdeb83ca05ed0fa352290ec8f78bb28a2d1d2fb" # 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 f423943332..0a1c8f3eee 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;branch=master;protocol=https" -SRCREV = "119e5a2c07b2e87ec2e75c98c06522c76bd59832" +SRCREV = "124e63beaf84a848d51daaf73065860ec6a0482d" 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 5615bf374c..6ea8c4072d 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -44,7 +44,7 @@ FILES:${PN}-monitor += "${nonarch_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;branch=master;protocol=https" -SRCREV = "c4b6ce728089737ad85ab5cfa7f34e2a912f091b" +SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504" S = "${WORKDIR}/git" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index a8fddf5f8a..e1c464b08d 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=https;branch=master" -SRCREV = "a1ed140b5351e1b264471b0462cc4eab753fbda6" +SRCREV = "b7d7bd5a384ea501766b15e4613eb9b14fe71e7f" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" 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 d02300a244..4afbc14a4f 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -21,7 +21,7 @@ DEPENDS += "libgpiod" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd;branch=master;protocol=https" -SRCREV = "4f26b3ee7de4e9a38acae3d7487ce746c3f656f7" +SRCREV = "aee6540154f2ac8ea510efacd2785868c1898a7d" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" @@ -34,7 +34,6 @@ SYSTEMD_SERVICE:${PN} += "${SERVICE_FILE}" EXTRA_OEMESON:append = " \ -Dsnoop-device=${SNOOP_DEVICE} \ -Dpost-code-bytes=${POST_CODE_BYTES} \ - -Dsystemd-target=multi-user.target \ -Dtests=disabled \ " diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh index e61ede9111..c493160300 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh @@ -411,9 +411,25 @@ HERE debug_takeover "$msg" fi -rm -rf $work +# Empty workdir; do not remove workdir itself for it will fail to recreate it if +# RWFS is full +if [ -d $work ] +then + find $work -maxdepth 1 -mindepth 1 -exec rm -rf '{}' + +fi + mkdir -p $upper $work +# Opportunisticly set a sane BMC date based on a file that gets +# written right before rebooting or powercycling. If none exists, +# use the image build date. +files="$upper/var/lib/systemd/random-seed $rodir/etc/os-release" +time=$(find $files -exec stat -c %Y {} \; | sort -n | tail -n 1) +# Allow RTC coordinated time to supersede this setting +if [ "$(date +%s)" -lt "$time" ]; then + date -s @$((time + 5)) || true +fi + mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root while ! chroot /root /bin/sh -c "test -x '$init' -a -s '$init'" @@ -433,6 +449,4 @@ do mount --move $f root/$f done -# switch_root /root $init -exec chroot /root $init - +exec switch_root /root $init diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist index 20f1ec2a6d..cfe4280a8a 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist @@ -1,6 +1,7 @@ /etc/dropbear/dropbear_rsa_host_key /etc/group /etc/gshadow +/etc/ipmi_pass /etc/machine-id /etc/passwd /etc/resolv.conf diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d86041f1b0..a30f1208aa 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -10,10 +10,12 @@ GROUPADD_PARAM:${PN} = "web; redfish" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" +WARN_QA:remove = " buildpaths" + SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https;nobranch=1" PV = "1.0+git${SRCPV}" -SRCREV = "9a5aceac206a550930204f102f1b84d808579407" +SRCREV = "382d64759b0848f18bad9e0d85a8291529ced0e9" 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 7ec6be67ad..03dc0781da 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;branch=master;protocol=https" -SRCREV = "794a6c5fea1517809da08f311f6e4853938ea7e3" +SRCREV = "f3f185507c66244b3b655d67126dcb87d122ed50" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb index 16790a3817..ee839cc231 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -5,7 +5,7 @@ of OpenBMC platforms." PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools \ +inherit meson \ pkgconfig \ python3native \ phosphor-dbus-yaml \ @@ -20,11 +20,11 @@ DEPENDS += " \ phosphor-logging \ sdbusplus \ ${PYTHON_PN}-sdbus++-native \ - autoconf-archive-native \ libcereal \ ${PYTHON_PN}-native \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-mako-native \ + nlohmann-json \ " OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory" @@ -34,13 +34,11 @@ DBUS_SERVICE:${PN} = "${OBMC_INVENTORY_MGR_IFACE}.service" S = "${WORKDIR}/git" -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_HOST}${base_datadir} \ - BUSNAME=${OBMC_INVENTORY_MGR_IFACE} \ - INVENTORY_ROOT=${OBMC_INVENTORY_PATH} \ - IFACE=${OBMC_INVENTORY_MGR_IFACE} \ - IFACES_PATH=${STAGING_DIR_TARGET}${yaml_dir} \ +EXTRA_OEMESON = " \ + -Dtests=disabled \ + -DYAML_PATH=${STAGING_DIR_HOST}${base_datadir} \ + -DIFACES_PATH=${STAGING_DIR_TARGET}${yaml_dir} \ " PACKAGECONFIG ??= "" -PACKAGECONFIG[associations] = "--enable-associations, --disable-associations,nlohmann-json," +PACKAGECONFIG[associations] = "-Dassociations=enabled, -Dassociations=disabled" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 8aff6f24ea..968c9662f6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -6,12 +6,11 @@ PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit autotools pkgconfig +inherit meson pkgconfig -DEPENDS += "autoconf-archive-native" - -EXTRA_OECONF = "--disable-tests" +EXTRA_OEMESON = "-Dtests=disabled" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool;branch=master;protocol=https" -SRCREV = "98e59f31573fc9024b3450ac70b9d67f59d3ad0d" +SRCREV = "ee975086169fce82413c27fefb871b779ea6b657" + 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 440a36ff7b..a4a456a351 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 @@ -19,7 +19,7 @@ PACKAGECONFIG[blobtool] = "-Dblobtool=enabled,-Dblobtool=disabled" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore;branch=master;protocol=https" -SRCREV = "f3aa37a7d0ae9f360037292c11b865d85f175d83" +SRCREV = "62872f5cb38e755a5325a7f4875a053bd357ef1a" FILES:${PN}:append = " ${libdir}/ipmid-providers" FILES:${PN}:append = " ${libdir}/blob-ipmid" 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 e75c185a6c..9e938ecee5 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 += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs;branch=master;protocol=https" -SRCREV = "35b6c3e63527738a0ab052d4fe2c75c1141c2b18" +SRCREV = "83f9992cc60dedb6a2a964a733fd35c89c8a0cfa" FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index bc64f4e246..8d62b596c2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -19,4 +19,4 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/btbridge;branch=master;protocol=https" -SRCREV="713a5470b4a1327abf9857870ba7d9cbcd5a54d4" +SRCREV="a6ec899618a28a30f7907a6cc90fe027047297d1" 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 a5067e69ae..8973eb2773 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -47,7 +47,7 @@ EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash;branch=master;protocol=https" -SRCREV = "36af21c513378d8ba1d8335ce922caa8c34cbf82" +SRCREV = "a4216a593f339dd4ce96bc7ad316b1100b6ab7a2" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += " \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index e6ba676809..e6fb5561cc 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-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser;branch=master;protocol=https" -SRCREV = "cf2dee3476a7e26ab99b50efe87155cc50432a9c" +SRCREV = "5e8829e85fe92213defbd95301ff5b83233231c9" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 81e0dcd72a..e4357b55ba 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;branch=master;protocol=https" -SRCREV = "5d38067181b376bf487872c73a55c7c9f1089a18" +SRCREV = "a23af1206bc4c835516909c87c71be0e7428264c" 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 71db1e9f87..392226088a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" RRECOMMENDS:${PN} += "packagegroup-obmc-ipmid-providers-libs" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-ipmiprovider-symlink inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-systemd @@ -22,21 +22,21 @@ def ipmi_whitelists(d): return ' '.join(whitelists) PACKAGECONFIG ??= "allowlist i2c-allowlist boot-flag-safe-mode softoff libuserlayer" -PACKAGECONFIG[dynamic-sensors] = "--enable-dynamic-sensors,--disable-dynamic-sensors" -PACKAGECONFIG[hybrid-sensors] = "--enable-hybrid-sensors,--disable-hybrid-sensors" -PACKAGECONFIG[sel-logger-clears-sel] = "--enable-sel-logger-clears-sel,--disable-sel-logger-clears-sel" -PACKAGECONFIG[allowlist] = "--enable-ipmi-whitelist,--disable-ipmi-whitelist" -PACKAGECONFIG[i2c-allowlist] = "--enable-i2c-whitelist-check,--disable-i2c-whitelist-check" -PACKAGECONFIG[transport-oem] = "--enable-transport-oem,--disable-transport-oem" -PACKAGECONFIG[boot-flag-safe-mode] = "--enable-boot-flag-safe-mode-support,--disable-boot-flag-safe-mode-support" -PACKAGECONFIG[softoff] = "--enable-softoff,--disable-softoff" -PACKAGECONFIG[update-functional-on-fail] = "--enable-update-functional-on-fail,--disable-update-functional-on-fail" -PACKAGECONFIG[libuserlayer] = "--enable-libuserlayer,--disable-libuserlayer" -PACKAGECONFIG[sensors-cache] = "--enable-sensors-cache,--disable-sensors-cache" - - -DEPENDS += "autoconf-archive-native" +PACKAGECONFIG[dynamic-sensors] = "-Ddynamic-sensors=enabled,-Ddynamic-sensors=disabled" +PACKAGECONFIG[hybrid-sensors] = "-Dhybrid-sensors=enabled,-Dhybrid-sensors=disabled" +PACKAGECONFIG[sel-logger-clears-sel] = "-Dsel-logger-clears-sel=enabled,-Dsel-logger-clears-sel=disabled" +PACKAGECONFIG[allowlist] = "-Dipmi-whitelist=enabled,-Dipmi-whitelist=disabled" +PACKAGECONFIG[i2c-allowlist] = "-Di2c-whitelist-check=enabled,-Di2c-whitelist-check=disabled" +PACKAGECONFIG[transport-oem] = "-Dtransport-oem=enabled,-Dtransport-oem=disabled" +PACKAGECONFIG[boot-flag-safe-mode] = "-Dboot-flag-safe-mode-support=enabled,-Dboot-flag-safe-mode-support=disabled" +PACKAGECONFIG[softoff] = "-Dsoftoff=enabled,-Dsoftoff=disabled" +PACKAGECONFIG[update-functional-on-fail] = "-Dupdate-functional-on-fail=enabled,-Dupdate-functional-on-fail=disabled" +PACKAGECONFIG[libuserlayer] = "-Dlibuserlayer=enabled,-Dlibuserlayer=disabled" +PACKAGECONFIG[sensors-cache] = "-Dsensors-cache=enabled,-Dsensors-cache=disabled" + + DEPENDS += "nlohmann-json" +DEPENDS += "openssl" DEPENDS += "phosphor-state-manager" DEPENDS += "${@ipmi_whitelists(d)}" DEPENDS += "phosphor-dbus-interfaces" @@ -55,8 +55,6 @@ DEPENDS += "${PYTHON_PN}-mako-native" VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" -RDEPENDS:${PN}-dev += "phosphor-logging" -RDEPENDS:${PN}-dev += "phosphor-mapper-dev" RDEPENDS:${PN} += "clear-once" RDEPENDS:${PN} += "phosphor-network" RDEPENDS:${PN} += "phosphor-time-manager" @@ -84,15 +82,17 @@ WHITELIST_CONF = " \ ${STAGING_DATADIR_NATIVE}/phosphor-ipmi-host/*.conf \ ${S}/host-ipmid-whitelist.conf \ " -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 \ +EXTRA_OEMESON = " \ + -Dsensor-yaml-gen=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ " -EXTRA_OECONF:append = " \ - WHITELIST_CONF="${WHITELIST_CONF}" \ +EXTRA_OEMESON:append = " \ + -Dwhitelist-conf="${WHITELIST_CONF}" \ " +EXTRA_OEMESON:append = " -Dtests=disabled" + S = "${WORKDIR}/git" SRC_URI += "file://merge_yamls.py " 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 17d27c5072..874d871505 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;branch=master;protocol=https" -SRCREV = "8227626764edf13350c5f5a5857298a905fb43f7" +SRCREV = "ede5e5ea402e1fb491a05c316ddef648a013d1a3" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" 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 5b54d2c3bd..5aba357915 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -29,4 +29,4 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git;branch=master;protocol=https" -SRCREV = "7580a8e60d868b5bcb1a8f8d276374afe7c0983a" +SRCREV = "bc7bf463229b69bb2346cc66f1e4b9f65f5374bd" 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 85366f94c6..b23efbea80 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -6,10 +6,9 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig +inherit meson pkgconfig inherit systemd -DEPENDS += "autoconf-archive-native" DEPENDS += "cli11" DEPENDS += "phosphor-mapper" DEPENDS += "systemd" @@ -18,10 +17,14 @@ DEPENDS += "phosphor-ipmi-host" RRECOMMENDS:${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid;branch=master;protocol=https" -SRCREV = "aa8b541d6b4aba53a3a0b39d9123f433cb5cc5e7" +SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2" S = "${WORKDIR}/git" +EXTRA_OEMESON = " \ + -Dtests=disabled \ + " + FILES:${PN} += " \ ${systemd_system_unitdir}/${PN}@.service \ ${systemd_system_unitdir}/${PN}@.socket \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index a5459c88f4..7dd27f7526 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -21,5 +21,5 @@ DEPENDS += "cli11" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=https;branch=master" -SRCREV= "2c2b8280584d05d16a4d0c180be8c3a6ee37aec2" +SRCREV= "88cdf7d12a0e4a8377e5ec664bd60a456cbbb5f3" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 5acff8ac63..a0bcab1797 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;branch=master;protocol=https" -SRCREV = "aff56f3967fe121622c631859f4fb92b576cd1cf" +SRCREV = "0a4792e16b79ee7791ed09293fba9fae6d231af4" 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 c481aa5db1..b2cf9f7ab4 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -54,6 +54,12 @@ INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" +CHASSIS_BLACKOUT_TGT = "obmc-chassis-blackout@{0}.target" +LED_STOP_SVC = "obmc-led-group-stop@.service" +LED_POWER_STOP_SVC = "obmc-led-group-stop@power_on.service" +CHASSIS_LED_BLACKOUT_FMT = "../${LED_STOP_SVC}:${CHASSIS_BLACKOUT_TGT}.wants/${LED_POWER_STOP_SVC}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'CHASSIS_LED_BLACKOUT_FMT', 'OBMC_CHASSIS_INSTANCES' )}" + # Install the override to set up a Conflicts relation SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" 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 1ac594e257..43816efe80 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -20,7 +20,7 @@ EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs;branch=master;protocol=https" SRC_URI += "file://70-leds.rules" -SRCREV = "97db22fd8fc5abad784aa662407e05d1f11893ae" +SRCREV = "02f366d68bb9752e6de04db0efc8eb885b19b219" S = "${WORKDIR}/git" do_install:append() { diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index e556d890ec..8183d08afa 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp;branch=master;protocol=https \ file://default" -SRCREV = "f39c38575828a53d59883ae999f03e6b48ee7c24" +SRCREV = "fe763e9820668b90c22b0101994ac6bd6cd41c09" DEPENDS += "autoconf-archive-native \ systemd \ diff --git a/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb new file mode 100644 index 0000000000..6818e31fb2 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "BIOS BMC SMM Error Logger" +DESCRIPTION = "Allows BIOS in SMM to log errors to the BMC" +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +inherit meson pkgconfig systemd + +DEPENDS += " \ + boost \ + fmt \ + stdplus \ + systemd \ + nlohmann-json \ + libbej \ + sdbusplus \ + phosphor-dbus-interfaces \ +" + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/openbmc/bios-bmc-smm-error-logger;branch=main;protocol=https" +SRCREV = "a3b64fb63eb86e554657168133804db5db271f5e" + +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.bios_bmc_smm_error_logger.service" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index e536cbb41c..e574682afc 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;branch=master;protocol=https" -SRCREV = "1ecbb996d9c88871db20c455db02ee055bff10f2" +SRCREV = "d68863396c608912a820926d8d98d92499f49ac2" # Disable unit tests EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 49d362e8a4..8bc57d346a 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES:phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging;branch=master;protocol=https" -SRCREV = "0f57ddccd0d83c81df5e5fa54a31df5d7e21b6c5" +SRCREV = "87408a45f07ddc97fef6b4b1f94fde71f893361d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb index 835405eaf1..87c997047f 100644 --- a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb +++ b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb @@ -6,7 +6,7 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-misc;branch=master;protocol=https" -SRCREV = "669bb350cd2722f0d2bfd6cb4a22142e7e6c1488" +SRCREV = "8ae2fcd1cad309c607671dd83a94aa13cc2fbdc6" S = "${WORKDIR}/git" @@ -23,9 +23,7 @@ PHOSPHOR_MISC_PACKAGES = " \ ${@bb.utils.contains('PACKAGECONFIG', 'usb-ctrl', '${PN}-usb-ctrl', '', d)} \ " -PACKAGES:remove = "${PN}" -RDEPENDS:${PN}-dev = "" - +PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" PACKAGE_BEFORE_PN += "${PHOSPHOR_MISC_PACKAGES}" SYSTEMD_PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index a013fed7b5..658fe8e409 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd;branch=master;protocol=https" -SRCREV = "a91c654c1b5117ab23541d9aef5f32c75c317e51" +SRCREV = "8e61ca9dac86cfb669fa297a04436129dc446a70" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" @@ -21,7 +21,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "libnl" DEPENDS += "stdplus" -PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra" +PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra persist-mac" UBOOT_ENV_RDEPENDS = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}" @@ -30,6 +30,7 @@ PACKAGECONFIG[default-ipv6-accept-ra] = "-Ddefault-ipv6-accept-ra=true,-Ddefault PACKAGECONFIG[nic-ethtool] = "-Dnic-ethtool=true,-Dnic-ethtool=false,," PACKAGECONFIG[sync-mac] = "-Dsync-mac=true,-Dsync-mac=false,nlohmann-json," PACKAGECONFIG[hyp-nw-config] = "-Dhyp-nw-config=true, -Dhyp-nw-config=false,," +PACKAGECONFIG[persist-mac] = "-Dpersist-mac=true, -persist-mac=false,," 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 57f2079f1e..ba460ed1e4 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://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp;branch=master;protocol=https" -SRCREV = "dec302696ab3d2f89b64d401e0da9d9bf240c7e5" +SRCREV = "c0d7cd47d4b198f752be3f497bc3c9ae98bb7141" 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 8c9d02036f..e420a96bc9 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;branch=master;protocol=https" -SRCREV = "c021dbc88a4b7009941a72c95c108c03c1409d10" +SRCREV = "06fca44170bfd511d519f64fe75da770e0bfd5d7" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 50a4aebd36..6e62bb2631 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;branch=master;protocol=https" -SRCREV = "c9e840e443d88bdef496388ccbdbc419868ab1ba" +SRCREV = "10eaa6c03a41f2f4b088650cc6d53edad25895a2" 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 adfdd58eee..8c171d625c 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;branch=master;protocol=https" -SRCREV = "434ae48312f46c4b1a37bce84d91bb014bf19839" +SRCREV = "97092314b107744e290b3fd6cf0eeef43247400c" 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 f295e7e021..6b773dff12 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 @@ -22,7 +22,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https;branch=master" -SRCREV = "38d32a3d5fb434cf08603e4e7bf5ba5372cfd02d" +SRCREV = "628058fadb9d4c35dbe2c9636f3e6e93767e9526" 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 9333aae6e2..8ef6dafc99 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;branch=master;protocol=https" -SRCREV = "9eb0cc3d8272bcdc58ead70c9a39fe8cecd5b6b5" +SRCREV = "6c106d66e390352a6914e8dc5ddad20943eceaa6" PV = "0.1+git${SRCPV}" @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" PACKAGECONFIG ??= " \ adcsensor \ - cpusensor \ + intelcpusensor \ exitairtempsensor \ fansensor \ hwmontempsensor \ @@ -23,7 +23,7 @@ PACKAGECONFIG ??= " \ " PACKAGECONFIG[adcsensor] = "-Dadc=enabled, -Dadc=disabled" -PACKAGECONFIG[cpusensor] = "-Dcpu=enabled, -Dcpu=disabled" +PACKAGECONFIG[intelcpusensor] = "-Dintel-cpu=enabled, -Dintel-cpu=disabled" PACKAGECONFIG[exitairtempsensor] = "-Dexit-air=enabled, -Dexit-air=disabled" PACKAGECONFIG[fansensor] = "-Dfan=enabled, -Dfan=disabled" PACKAGECONFIG[hwmontempsensor] = "-Dhwmon-temp=enabled, -Dhwmon-temp=disabled" @@ -37,8 +37,8 @@ PACKAGECONFIG[external] = "-Dexternal=enabled, -Dexternal=disabled" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ 'xyz.openbmc_project.adcsensor.service', \ '', d)}" -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpusensor', \ - 'xyz.openbmc_project.cpusensor.service', \ +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'intelcpusensor', \ + 'xyz.openbmc_project.intelcpusensor.service', \ '', d)}" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'exitairtempsensor', \ 'xyz.openbmc_project.exitairsensor.service', \ @@ -69,6 +69,7 @@ DEPENDS = " \ boost \ i2c-tools \ libgpiod \ + liburing \ nlohmann-json \ phosphor-logging \ sdbusplus \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 35e9e7361b..160abb2d99 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -45,7 +45,7 @@ RDEPENDS:max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" SRC_URI += "git://github.com/openbmc/phosphor-hwmon;branch=master;protocol=https" -SRCREV = "0bbd07c008404ed701b336d8a2b398407b908fe6" +SRCREV = "5e5259bf6710f22d3b78667098e56fa0e4895160" 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 4ae4fb39bf..be336de19e 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=https;branch=master" -SRCREV = "5c4de839b88fc69387a49bbf1d8b09f304c16582" +SRCREV = "d4f5199251f2acbcf007c9bc163fd65d3695655b" 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 736e177efb..e697855704 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -8,15 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" inherit meson pkgconfig inherit systemd -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "sdeventplus" -DEPENDS += "phosphor-logging" -DEPENDS += "nlohmann-json" -DEPENDS += "exprtk" +DEPENDS:append = "\ + exprtk \ + nlohmann-json \ + phosphor-dbus-interfaces \ + phosphor-logging \ + sdbusplus \ +" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=https;branch=master" -SRCREV = "27faf7ca7d7b6ed3d47b450763b09bc240ccf91e" +SRCREV = "e667239d5a57ee3599c6378839e7858a545ae275" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb index 98ee696495..4aac9bf60f 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb @@ -24,7 +24,7 @@ do_install() { do for f in ${SETTINGS_HOST_TEMPLATES}; do - cat ${f} | sed "s/{}/${i}/g" >> ${DEST}/defaults.yaml + sed "s/{}/${i}/g" ${f} >> ${DEST}/defaults.yaml done done } diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc index eb79ef499a..474e4a5fb5 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;branch=master;protocol=https" -SRCREV = "75a710ca87f6033419d856d965f6100aa4348196" +SRCREV = "7c6827c9fa785fdef5a9f0e7375b0d18e86d2adc" diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index 701774fef2..34e1e5d2c1 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -28,7 +28,7 @@ EXTRA_OECMAKE = "-DYOCTO=ON" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/smbios-mdr.git;branch=master;protocol=https" -SRCREV = "e4ea37716d0d282ef664d5a70979274fe40e7c8b" +SRCREV = "b492838a92351ecae20a80c9f3c176507f6f72f4" SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index b8c0a1c8e7..a37cf59e60 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" SRC_URI = "git://github.com/openbmc/service-config-manager;branch=master;protocol=https" -SRCREV = "f27f431faa0c40c0253e50cddd92ffcb99081604" +SRCREV = "af2b835f9ae7edd06cf234f5b95b7cd51cb80ebc" inherit meson pkgconfig systemd 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 6e06fc7607..9b8df2cbe3 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;branch=master;protocol=https" -SRCREV = "e709874a634cfe19350d31b06bbfec3c8f61a826" +SRCREV = "a27519e987a8341585e50913930862825c48cd26" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index 2a3f04429b..2a5bfda50f 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -19,6 +19,7 @@ DEFAULT_TARGETS = " \ obmc-host-force-warm-reboot@{}.target.requires/phosphor-reboot-host@{}.service \ obmc-host-warm-reboot@{}.target.requires/obmc-host-force-warm-reboot@{}.target \ obmc-chassis-poweroff@{}.target.wants/phosphor-clear-one-time@{}.service \ + obmc-chassis-blackout@{}.target.wants/phosphor-reset-sensor-states@{}.service \ " # TODO: There are some targets that are chassis oriented, but there is no 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 3190d5d7c1..b81127cdac 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -59,10 +59,12 @@ DEPENDS += "cli11" DEPENDS += "libgpiod" RDEPENDS:${PN}-chassis += "bash" +RDEPENDS:${PN}-host += "bash" EXTRA_OEMESON:append = " -Dtests=disabled" FILES:${PN}-host = "${bindir}/phosphor-host-state-manager" +FILES:${PN}-host += "${libexecdir}/host-reboot" DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host@.service" DBUS_SERVICE:${PN}-host += "phosphor-reboot-host@.service" SYSTEMD_SERVICE:${PN}-host += "phosphor-reset-host-reboot-attempts@.service" @@ -123,7 +125,8 @@ CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on" # - powered-off: Services to run once chassis power is off # - reset: Services to check chassis power state and update chassis "on" target # - hard-off: Services to force an immediate power off of the chassis -CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff" +# - blackout: Target to enter when chassis experiences blackout +CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff blackout" # Track all host synchronization point targets # - start-pre: Services to run before we start host boot @@ -198,6 +201,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO SRC_URI += "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "77a918310fd4db0f22b1a56a38ec06f05746dca1" +SRCREV = "7e0e4e9227d495b47ebc6c38b97998254dcad5be" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged.bb b/meta-phosphor/recipes-phosphor/storage/estoraged.bb index 5b41d14c9f..92c92d7a05 100644 --- a/meta-phosphor/recipes-phosphor/storage/estoraged.bb +++ b/meta-phosphor/recipes-phosphor/storage/estoraged.bb @@ -16,9 +16,11 @@ DEPENDS += "stdplus" RDEPENDS:${PN} += "e2fsprogs" +EXTRA_OEMESON = "-Dtests=disabled" + S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/estoraged.git;branch=master;protocol=https" -SRCREV = "4906f4ef7e04ddbbf18a401a5b9963748270cce2" +SRCREV = "da5e96a7e322d4a6bfef21438266114e55682161" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.eStoraged.service" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 0db2de7b7a..5c2eb37e3a 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;branch=master;protocol=https" PV = "1.0+git${SRCPV}" -SRCREV = "e0ed508c17b8933762faa7a5e22dd2aa93200278" +SRCREV = "458a37d19dcba48c6ff18ae4716faa7d39337300" 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 9e3bd4d547..e5a2939762 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -31,7 +31,7 @@ FILES:phosphor-ldap += " \ ${bindir}/phosphor-ldap-conf \ " FILES:${PN} += " \ - ${base_libdir}/systemd \ + ${systemd_unitdir} \ ${datadir}/dbus-1 \ ${datadir}/phosphor-certificate-manager \ " @@ -39,5 +39,5 @@ DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.Ldap.Config.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager;branch=master;protocol=https" -SRCREV = "2f64e4206e2e46a3c2ca4e19a5162f1df6fb97ea" +SRCREV = "fba4bb174a33b78074578f2b42749dd0fad15272" 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 21b597410d..7331bdb356 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;branch=master;protocol=https" -SRCREV = "90b400938fbed35040d9adf17c2af897b1046e12" +SRCREV = "d6bc8e88eb6dba6c11daca7371118e943da50f50" 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 f32cc1dcfc..6941ae8b33 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;branch=master;protocol=https" -SRCREV = "f59274e8ec337e7f4b135726d6b846fb813d60cb" +SRCREV = "e16bb5c35893591eab048ae4ef646a9e5e2f7e94" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native " @@ -16,6 +16,7 @@ inherit allarch FILES:${PN} += "${datadir}/www/*" do_compile () { + bbwarn "phosphor-webui is deprecated and has been replaced with webui-vue" cd ${S} rm -rf node_modules npm --loglevel info --proxy=${http_proxy} --https-proxy=${https_proxy} install diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index bb6e3f9d0f..ee0a386a30 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;branch=master;protocol=https" -SRCREV = "fedc7344df80d87050966a4903f7aff32fddd259" +SRCREV = "d9566225f1c25b1892c332e0f3a16c1b5e4ba714" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-support/boost/boost_%.bbappend b/meta-phosphor/recipes-support/boost/boost_%.bbappend index 7aaa35c695..475c830c7b 100644 --- a/meta-phosphor/recipes-support/boost/boost_%.bbappend +++ b/meta-phosphor/recipes-support/boost/boost_%.bbappend @@ -8,5 +8,6 @@ # #https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#boost # -BOOST_LIBS:openbmc-phosphor = "chrono thread context coroutine" +BOOST_LIBS:openbmc-phosphor:class-target = "chrono thread context coroutine" +PACKAGECONFIG:openbmc-phosphor:class-target = "" 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 45100dd5a9..6383216ad5 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=https;branch=master" -SRCREV = "99e8f9dfe6ed99e201f5920c512587fe3af3cdb9" +SRCREV = "b38fe83748b3535adeca48a19afdefde91b9e70a" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb index ccd894aabf..78d40f08f1 100644 --- a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb +++ b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb @@ -8,7 +8,7 @@ inherit cmake pkgconfig systemd SRC_URI = "git://github.com/openbmc/libpeci;branch=master;protocol=https" PV = "0.1+git${SRCPV}" -SRCREV = "7b11280d8e3113aecc4b9ce6e5d818268eb2122c" +SRCREV = "58dac1fdb2c4656f151509be4105ea0be3ab1988" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index 11e2519f3a..19974e710f 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie;branch=master;protocol=https" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "328685e5962fb4e563f603fb662633fed00aff0e" +SRCREV = "be1fdbfddb8f753132e781109e72b5f2c64140a2" S = "${WORKDIR}/git" diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest index 9a3f0aa1d6..a91af563b1 100755 --- a/meta-phosphor/scripts/run-repotest +++ b/meta-phosphor/scripts/run-repotest @@ -18,6 +18,7 @@ trap 'rm $patch_files_tmp $allowed_patches_tmp' exit git ls-files -- \ '*.patch' \ ':!:poky/**' \ + ':!:meta-arm/**' \ ':!:meta-security/**' \ ':!:meta-raspberrypi/**' \ ':!:meta-openembedded/**' \ @@ -38,7 +39,6 @@ meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offs meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch -meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-board-aspeed-Add-Mux-for-yosemitev2.patch meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0002-spl-host-console-handle.patch @@ -48,6 +48,7 @@ meta-google/recipes-extended/libconfig/files/0001-makefile-Add-missing-LDFLAGS.p meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch meta-nuvoton/recipes-bsp/images/npcm7xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch +meta-nuvoton/recipes-bsp/images/npcm8xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch @@ -81,6 +82,7 @@ trap 'rm $dts_files_tmp $allowed_dts_tmp' exit git ls-files -- \ '*.dts' \ ':!:poky/**' \ + ':!:meta-arm/**' \ ':!:meta-security/**' \ ':!:meta-raspberrypi/**' \ ':!:meta-openembedded/**' \ @@ -202,6 +204,7 @@ done non_bbfiles=$(git ls-files -- \ ':!:poky/**' \ + ':!:meta-arm/**' \ ':!:meta-security/**' \ ':!:meta-raspberrypi/**' \ ':!:meta-openembedded/**' \ |