phosphor-logging: convert to meson
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2a5eb57d100ced02043bf68f64e4596c59da6ebd
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
index a5b6990..e714a8e 100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -7,13 +7,12 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-inherit autotools pkgconfig
+inherit meson
inherit python3native
inherit obmc-phosphor-dbus-service
inherit phosphor-logging
inherit phosphor-dbus-yaml
-DEPENDS += "autoconf-archive-native"
DEPENDS += "systemd"
DEPENDS += "${PYTHON_PN}-mako-native"
DEPENDS += "${PYTHON_PN}-pyyaml-native"
@@ -56,21 +55,16 @@
S = "${WORKDIR}/git"
-PACKAGECONFIG ??= "metadata-processing"
-
-PACKAGECONFIG[metadata-processing] = " \
- --enable-metadata-processing, \
- --disable-metadata-processing, , \
- "
+PACKAGECONFIG ??= ""
PACKAGECONFIG[openpower-pels] = " \
- --enable-openpower-pel-extension, \
- --disable-openpower-pel-extension, \
+ -Dopenpower-pel-extension=enabled, \
+ -Dopenpower-pel-extension=disabled, \
nlohmann-json cli11 pldm, \
python3, \
"
-EXTRA_OECONF = " \
- YAML_DIR=${STAGING_DIR_TARGET}${yaml_dir} \
- CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \
+EXTRA_OEMESON = " \
+ -Dyamldir=${STAGING_DIR_TARGET}${yaml_dir} \
+ -Dcallout_yaml=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \
"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
index 75f5e7e..2644239 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -1 +1 @@
-EXTRA_OECONF_append_gbs = " ERROR_INFO_CAP=256"
+EXTRA_OEMESON_append_gbs = " -Derror_info_cap=256"