From c617fe598f4240abe1330c6318666bce7986403d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Oct 2021 15:10:28 +0000 Subject: openpower-debug-collector: srcrev bump 9b6f8474a4..09cf37962a Shantappa Teekappanavar (1): Remove checks for AutoReboot in watchdog timeout Change-Id: I49aa3ae4fa6b007965a6ddb1832189ac52da1f6f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/debug') diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index efeaf1f3d..7c6e22aea 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 = "09cf37962a1c0b53e226a6a04bdf2d0f1b4d77e8" -- cgit v1.2.3 From 8c561eecb190655d51249c37286cc2c904dee7c0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:20:12 -0500 Subject: treewide: clean up recipe checks in OBMC_MACHINE_FEATURES OBMC_MACHINE_FEATURES is a variable that probably shouldn't even exist as all it does is provide a level of indirection to the real MACHINE_FEATURES (in phosphor-base.inc, OBMC_ is added to the base). There are a few recipes that have developed checks against OBMC_MACHINE_FEATURES for enabling recipe-level features when they should be checking the standard MACHINE_FEATURES variable. Clean up this recipe-level indirection. Signed-off-by: Patrick Williams Change-Id: Id437b93aa6c1de9a27726eea9b7e2c30e71ab3bf --- .../logging/phosphor-logging_%.bbappend | 2 +- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- .../openpower-debug-collector-systemd-links.inc | 4 ++-- .../debug/openpower-debug-collector_git.bb | 2 +- .../host/op-proc-control-systemd-links.bb | 4 ++-- .../recipes-phosphor/host/op-proc-control_git.bb | 26 +++++++++++----------- .../logging/openpower-hw-diags_git.bb | 2 +- .../occ/openpower-occ-control_git.bb | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta-openpower/recipes-phosphor/debug') diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 361417410..aa69617da 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -11,7 +11,7 @@ FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_de FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" #Enable phal feature, if available. -PACKAGECONFIG:append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" do_install:append:p10bmc() { diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 8208a9cbb..30e7c6b75 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -15,5 +15,5 @@ SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" 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-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_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..cdb1da621 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -24,7 +24,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" 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 32a7d4778..92287f529 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -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/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4a61ba3bd..fc7c39dfc 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -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 ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" 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 b78b85bfb..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -43,7 +43,7 @@ EXTRA_OEMESON = " \ -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" -- cgit v1.2.3 From baf5ba7c52d366457831f44e06f2ac017c843377 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 10:01:23 -0500 Subject: meta-openpower:meson: pkgconfig inherit required Upstream yocto made a change recently that brought to light a bug in some of our recipes. If your meson makefiles utilize the dependency() function then the recipe must also include pkgconfig. Signed-off-by: Andrew Geissler Change-Id: I48c062226275c6e110bde27e815d2643c369c14c --- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openpower/recipes-phosphor/debug') diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index cda809e5c..ba649db9d 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -6,7 +6,7 @@ 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" 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 cdb1da621..b9a2393d9 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 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 4efdfce98..e0affeda1 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -19,7 +19,7 @@ SRCREV = "39fcf65dce4d91601951c146a543bf85d68f6b3c" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd SYSTEMD_SERVICE:${PN} = "attn_handler.service" 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" -- cgit v1.2.3 From 962fa6a37db32335fb6584fe1746c426544fd0b4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 04:10:19 +0000 Subject: openpower-debug-collector: srcrev bump 09cf37962a..2bd4621871 Manojkiran Eda (1): Add OWNERS file Shantappa Teekappanavar (1): Watchdog timeout support in SBE boot window Change-Id: I26e2d03199ca2ad15d9f7dde930854b1de4442bd Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc | 2 +- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-openpower/recipes-phosphor/debug') diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 7c6e22aea..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 = "09cf37962a1c0b53e226a6a04bdf2d0f1b4d77e8" +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 b9a2393d9..bcf356eee 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -16,6 +16,7 @@ DEPENDS += " \ phosphor-logging \ ${PYTHON_PN}-sdbus++-native \ cli11 \ + ipl \ " S = "${WORKDIR}/git" @@ -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" -- cgit v1.2.3