From ec34cc639e9a54f80bd542bb5afff9b4a4311bd9 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 09:57:52 -0500 Subject: meta-phosphor: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: Ie85e2a3bd86010c2ce5d08c75fddc1ba348ff891 --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb | 2 +- meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb | 2 +- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb | 2 +- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb | 2 +- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb | 2 +- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 +- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index b4b101936..454ca6097 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." -inherit meson +inherit pkgconfig meson inherit python3native include sdbusplus-rev.inc 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 14f7ce777..7dfee1c84 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -14,4 +14,4 @@ SYSTEMD_SERVICE:${PN} += "start-ipkvm.service" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 6665713d0..bba4eaf4a 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -16,7 +16,7 @@ DEPENDS = "boost \ valijson" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd EXTRA_OEMESON = "-Dtests=disabled" 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 59721cef1..397d14803 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -6,7 +6,7 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson +inherit pkgconfig meson inherit obmc-phosphor-utils inherit phosphor-dbus-yaml inherit python3native diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 8d40965c7..04388fba3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -20,7 +20,7 @@ DBUS_PACKAGES = "${PN}-manager" SYSTEMD_PACKAGES = "${PN}-monitor" -inherit meson \ +inherit pkgconfig meson \ obmc-phosphor-dbus-service \ python3native \ phosphor-debug-collector diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index aacb66388..07eb75d59 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -17,7 +17,7 @@ SRCREV = "37bbf98c8ba77196ba72864846ca3b4a4ff5be4b" S = "${WORKDIR}/git" -inherit meson ptest +inherit pkgconfig meson ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index fe432f0c7..b419db1c0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-hostlogger" PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson +inherit pkgconfig meson inherit systemd # License info diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 5acd8021d..1453ab49f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson +inherit pkgconfig meson inherit python3native inherit obmc-phosphor-dbus-service inherit phosphor-logging 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 20b104b90..6c10cb7c5 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 @@ -9,7 +9,7 @@ DESCRIPTION = "Utility to write IPMI SEL records to the journal" # SEL_LOGGER_MONITOR_THRESHOLD_EVENTS: # Monitors and logs SEL records for threshold sensor events -inherit meson systemd +inherit pkgconfig meson systemd S = "${WORKDIR}/git" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f6bf0d906..2c3a9e197 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -73,7 +73,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -inherit meson systemd +inherit pkgconfig meson systemd S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 1d080754d..3b2eb44a6 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -5,7 +5,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -inherit meson +inherit pkgconfig meson inherit obmc-phosphor-systemd PACKAGECONFIG ??= "" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 8844efb69..31e821618 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -12,7 +12,7 @@ SRCREV = "e28aa53dc1492f09a64dc9f1dbfd5b6dba06e31f" S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit systemd DEPENDS = "boost \ -- cgit v1.2.3