diff options
Diffstat (limited to 'meta-openpower')
27 files changed, 108 insertions, 56 deletions
diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index afbee1a8f..b106fdeba 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,6 +3,5 @@ PACKAGECONFIG:append = " mmc_layout" SYSTEMD_SERVICE:${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ - openpower-process-host-firmware.service \ - openpower-update-bios-attr-table.service \ + openpower-bios-factory-reset.service \ " diff --git a/meta-openpower/classes/openpower-software-manager-pldm.bbclass b/meta-openpower/classes/openpower-software-manager-pldm.bbclass new file mode 100644 index 000000000..3cfa4a217 --- /dev/null +++ b/meta-openpower/classes/openpower-software-manager-pldm.bbclass @@ -0,0 +1,6 @@ +PACKAGECONFIG:append = " pldm" + +SYSTEMD_SERVICE:${PN} += " \ + openpower-process-host-firmware.service \ + openpower-update-bios-attr-table.service \ +" diff --git a/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc new file mode 100644 index 000000000..6c67b728b --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "openpower-hostfw-over-pldm" +DISTROOVERRIDES .= ":df-openpower-hostfw-over-pldm" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 65d9a8aef..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc index af269c23e..eb262cbf7 100644 --- a/meta-openpower/conf/machine/include/p8.inc +++ b/meta-openpower/conf/machine/include/p8.inc @@ -1,2 +1,2 @@ include conf/machine/include/ibm-power8-cpu.inc -OBMC_MACHINE_FEATURES += 'i2c-occ' +MACHINE_FEATURES += 'i2c-occ' diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc index 2da9fd144..5c1779322 100644 --- a/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openpower/conf/machine/include/p9.inc @@ -1,3 +1,3 @@ include conf/machine/include/ibm-power9-cpu.inc -OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' +MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb new file mode 100644 index 000000000..df98965af --- /dev/null +++ b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "eCMD plugin with pdbg backend" +DESCRIPTION = "The glue code necessary for pdbg to be used as an eCMD plugin" +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +inherit meson +inherit pkgconfig + +SRC_URI = "git://git@github.com/open-power/ecmd-pdbg.git" +SRCREV = "349e04048409b4a619f4bc979aa5dd76e2bbc665" + +S = "${WORKDIR}/git" + +DEPENDS = "pdbg zlib libyaml ipl" + +FILES:${PN} += "${prefix}/help" + +EXTRA_OEMESON = " \ + -Dchip=p10 \ + " diff --git a/meta-openpower/recipes-bsp/ekb/ekb.inc b/meta-openpower/recipes-bsp/ekb/ekb.inc index 678675071..ddad05cb8 100644 --- a/meta-openpower/recipes-bsp/ekb/ekb.inc +++ b/meta-openpower/recipes-bsp/ekb/ekb.inc @@ -1,6 +1,6 @@ EKB_BRANCH = "main-p10" EKB_URI = "git://git@github.com/open-power/pub-ekb;branch=${EKB_BRANCH}" -EKB_REV = "c14cb37697636c15742efe1c0318d01da2f82902" +EKB_REV = "a9996cb6861198688010522baed369b0af0e6aca" REQ_ATTRS_XMLS = "hwpf/fapi2/xml/attribute_info/chip_attributes.xml \ hwpf/fapi2/xml/attribute_info/common_attributes.xml \ diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 0d5ff964f..ba649db9d 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -6,14 +6,14 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit meson +inherit pkgconfig meson S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/guard;branch="main"" -SRCREV = "87b02b63b64b36a925bec42723d70e0531e93407" +SRCREV = "3fa0e5e312cb4138afb11e083e9ba7b0f0d5d5dc" DEPENDS = "cli11" -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Ddevtree=enabled, -Ddevtree=disabled, pdata pdbg" diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 3e49bbd14..dfe2a40f6 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -7,17 +7,17 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -inherit autotools +inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "5edb65ddf5820579179d51bfc859fcd973aaac0d" +SRCREV = "11775c0f84a3e62735503294c1ee7ec61fcd4c9a" DEPENDS = " \ - libekb pdbg autoconf-archive guard \ + libekb pdbg autoconf-archive guard pdata \ " RDEPENDS:${PN} = "phal-devtree" -EXTRA_OECONF = "CHIP=p10" +EXTRA_OECONF = "CHIP=p10 --enable-libphal" diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb index ac650a4a8..7c6a7ad2d 100644 --- a/meta-openpower/recipes-bsp/libekb/libekb_git.bb +++ b/meta-openpower/recipes-bsp/libekb/libekb_git.bb @@ -17,7 +17,7 @@ inherit autotools \ SRCREV_FORMAT = "libekb_ekb" -SRCREV_libekb = "a68c2f610243d3f128f561c4451135241aedbf6b" +SRCREV_libekb = "5ac6a46364dc065e058f0886d3ae5717eb8a52f1" SRCREV_ekb = "${EKB_REV}" SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \ diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index 4beb125e2..6ebfa3de6 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main"" -SRCREV = "b05eb90ad19807ab0f8f1c861c56a0dbb0a75d0b" +SRCREV = "9d6b94bcd5bc52c435175e8e2c05555df6271e7e" DEPENDS = "pdbg \ libxml-simple-perl-native \ diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 9c522c1cd..b252e6c11 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -15,7 +15,7 @@ pkg_postinst:${PN}:append() { TARGET="../openpower-debug-collector-watchdog@.service" ln -s $TARGET $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK @@ -29,7 +29,7 @@ pkg_prerm:${PN}:append() { fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" rm $LINK fi diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index efeaf1f3d..6d8f3f9fb 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector" -SRCREV = "9b6f8474a4e33dbfda233dedceedf4c030ffd0ec" +SRCREV = "2bd4621871408c14728c9f90eb9ebf6552aa9fe7" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..bcf356eee 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Application to log error during host checkstop and watchdog timeo PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson \ +inherit pkgconfig meson \ obmc-phosphor-systemd \ python3native \ phosphor-dbus-yaml @@ -16,6 +16,7 @@ DEPENDS += " \ phosphor-logging \ ${PYTHON_PN}-sdbus++-native \ cli11 \ + ipl \ " S = "${WORKDIR}/git" @@ -24,7 +25,7 @@ S = "${WORKDIR}/git" APPS = " \ checkstop \ watchdog \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" @@ -34,4 +35,4 @@ SYSTEMD_SERVICE:${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" DEPENDS:remove:class-native = "phosphor-logging" # Do not depend on phosphor-logging for native SDK build -DEPENDS:remove:class-nativesdk = "phosphor-logging" +DEPENDS:remove:class-nativesdk = "phosphor-logging ipl" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 820ebc222..7b44d7840 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -31,10 +31,16 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 'openpower-software-manager-virtual-pnor', \ '', d)} +# PLDM Support +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-hostfw-over-pldm', \ + 'openpower-software-manager-pldm', \ + '', d)} + PACKAGECONFIG[verify_pnor_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" PACKAGECONFIG[ubifs_layout] = "-Ddevice-type=ubi,,,mtd-utils-ubifs" PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc" -PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled" +PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled,,bash" +PACKAGECONFIG[pldm] = "-Dpldm=enabled, -Dpldm=disabled" EXTRA_OEMESON += " \ -Dtests=disabled \ @@ -61,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4c2386a575c9bd2f69d73af131cd635cc3c09b04" +SRCREV = "9cbc06b10d2738f7c2e3472cd447612768739f1d" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8cedb62a5..f3c63adad 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" rm $LINK diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index dc405cec8..1a3fde452 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "61c8757c6b81d61ae158af002810cdbe7cdae7e2" +SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3" DEPENDS += " \ phosphor-logging \ @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - op-stop-instructions@.service \ - op-cfam-reset.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ - op-continue-mpreboot@.service \ - op-enter-mpreboot@.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb index ab461ad62..6ff19052a 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb @@ -21,7 +21,7 @@ HOSTIPMI_PROVIDER_LIBRARY += "libhiomap.so" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-flash" -SRCREV = "955103869df04cba4357ad0d5f45a868eb100399" +SRCREV = "90eea43e3e6a019344158766ac092acf2a240c24" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index eda8b91fd..0c9184fc6 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem" -SRCREV = "7bb95c3e238a05d4ff1445f5e0f020e8e410213f" +SRCREV = "531f8c55023e7f91b9299b0158aca2769e89e066" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4602fba57..9bbba105e 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,11 +15,11 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "96d5486c3ca5c5037e6f74bd3a1d196d91b80829" +SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd SYSTEMD_SERVICE:${PN} = "attn_handler.service" @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" -PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 1d3d2e1c1..e2239125c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "91f1d3d2aaddc0ea1097f3b29dfb37df920f1719" +SRCREV = "c0d0f36139346a28e79cdfd77905d8fa8fdefc71" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 183e2ed5c..d45d95f3c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -13,7 +13,7 @@ include openpower-libhei-rev.inc S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit perlnative DEPENDS = "libxml2-native libxml-simple-perl-native libjson-perl-native" diff --git a/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb new file mode 100644 index 000000000..588f750df --- /dev/null +++ b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "SBE log python parsers" +DESCRIPTION = "Used by peltool to parse SBE UserData sections and SRC details" +HOMEPAGE = "https://github.ibm.com/open-power/sbe" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_PROLOG;md5=d8e5f403c98fd80dcea90b9cc8cd083c" + +S = "${WORKDIR}/git" +SRC_URI += "git://git@github.com/open-power/sbe;branch="master-p10";protocol=ssh" +SRCREV = "f8ee8cfad2cf2a53e78789633ddffc192f5a197e" + +inherit setuptools3 diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 8ce44fce5..93c2ae5bd 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "ff7afd98651862b9a78b53ad0ba4c3b085e4fbe4" +SRCREV = "a7b74dc31001884243556e4433d0bbfda3c09083" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 440829175..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools \ +inherit meson \ pkgconfig \ obmc-phosphor-dbus-service \ python3native \ @@ -39,11 +39,11 @@ DEPENDS += " \ RDEPENDS:${PN} += "phosphor-state-manager-obmc-targets" -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN} \ - PS_DERATING_FACTOR=${POWER_SUPPLY_DERATING_FACTOR} \ +EXTRA_OEMESON = " \ + -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ + -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OECONF:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' --enable-i2c-occ', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" @@ -91,8 +91,8 @@ RDEPENDS:${PN}:remove:class-nativesdk += "phosphor-state-manager-obmc-targets" # Provide a means to enable/disable install_error_yaml feature PACKAGECONFIG ??= "install_error_yaml" PACKAGECONFIG[install_error_yaml] = "\ - --enable-install_error_yaml,\ - --disable-install_error_yaml,\ + -Dinstall-error-yaml=enabled,\ + -Dinstall-error-yaml=disabled,\ ,\ " diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 39f3054e8..c26dc27f6 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "b1e64bb6fa2605b41583a150c90812f756e2590b" +SRCREV = "88d2ae82af7fd97086c60fa9e39e0b4ee31a5974" |