diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2021-04-30 18:27:59 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-05-03 14:41:32 +0300 |
commit | 2d52a389366be11fed6a81378b0669e2c274f220 (patch) | |
tree | 230655a123600e138a22a5e48076461491b9af29 | |
parent | cbbc4842f4be7caaa94aa586c60dd5d64075ce66 (diff) | |
download | openbmc-2d52a389366be11fed6a81378b0669e2c274f220.tar.xz |
phosphor-logging: convert to meson
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2a5eb57d100ced02043bf68f64e4596c59da6ebd
-rw-r--r-- | meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 20 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index a5b6990fe..e714a8e26 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 @@ PV = "1.0+git${SRCPV}" 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 @@ SRCREV = "60356ad409fd51703ba2ac7ea13df3d7f0426d0c" 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 75f5e7ebe..264423933 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" |