From e5b39f63e81a697edd5d5958665c7f55b71cd133 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Aug 2021 09:23:57 -0700 Subject: phosphor-sel-logger: Convert to meson This switches from the CMake build to the meson one. Change-Id: I24ca927bcb02ca60250400ae44266b72911c0737 Signed-off-by: William A. Kennington III --- .../recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 24025dc8b..24a1697c6 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 cmake systemd +inherit meson systemd S = "${WORKDIR}/git" LICENSE = "Apache-2.0" @@ -19,7 +19,6 @@ DEPENDS += " \ boost \ sdbusplus \ systemd \ - phosphor-logging \ " SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" @@ -30,8 +29,8 @@ PV = "0.1+git${SRCPV}" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Logging.IPMI.service" PACKAGECONFIG ??= "" -PACKAGECONFIG[log-threshold] = "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=OFF," -PACKAGECONFIG[log-pulse] = "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON,-DREDFISH_LOG_MONITOR_PULSE_EVENTS=OFF," -PACKAGECONFIG[log-watchdog] = "-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=ON,-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=OFF," -PACKAGECONFIG[log-alarm] = "-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=OFF," -PACKAGECONFIG[send-to-logger] = "-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=ON,-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=OFF,phosphor-logging" +PACKAGECONFIG[log-threshold] = "-Dlog-threshold=true,-Dlog-threshold=false," +PACKAGECONFIG[log-pulse] = "-Dlog-pulse=true,-Dlog-pulse=false," +PACKAGECONFIG[log-watchdog] = "-Dlog-watchdog=true,-Dlog-watchdog=false," +PACKAGECONFIG[log-alarm] = "-Dlog-alarm=true,-Dlog-alarm=false," +PACKAGECONFIG[send-to-logger] = "-Dsend-to-logger=true,-Dsend-to-logger=false,phosphor-logging" -- cgit v1.2.3