From add9383834cc4d83657eea375b63971a00a7515e Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 10 Jun 2020 06:52:05 -0500 Subject: phosphor-logging: switch to non-native YAML providers Move phosphor-logging to use the non-native YAML providers included with the packagegroup-obmc-yaml-providers instead of the native structure provided by phosphor-logging-error-logs-native and phosphor-dbus-interfaces-native. (From meta-phosphor rev: 997addd33f2f21de4b883cf06ecec661e0f56c72) Signed-off-by: Patrick Williams Change-Id: I3cc1c53e1978f8cccd7d08e3761226b039ef1b8e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7599f0842..155e1ef61 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -20,12 +20,11 @@ DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-native" DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "sdbusplus" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" +DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "virtual/phosphor-logging-callouts" -DEPENDS += "phosphor-logging-error-logs-native" -DEPENDS += "phosphor-logging-native" DEPENDS += "libcereal" DEPENDS += "sdeventplus" +DEPENDS_append_class-target = " packagegroup-obmc-yaml-providers" PACKAGE_BEFORE_PN = "${PN}-test" FILES_${PN}-test = "${bindir}/*-test" @@ -109,7 +108,7 @@ PACKAGECONFIG_add_class-nativesdk = "install_scripts" PACKAGECONFIG_remove_class-target = "install_scripts" EXTRA_OECONF = " \ - YAML_DIR=${STAGING_DIR_NATIVE}${yaml_dir} \ + YAML_DIR=${STAGING_DIR_TARGET}${yaml_dir} \ CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ " -- cgit v1.2.3