ibm-logging: use non-native YAML providers
Remove the extra -native YAML provider dependencies and use the
non-native YAML providers obtained via the phosphor-loggging DEPEND.
Add a missing python dependency.
Simplify task dependency between do_report and do_install.
(From meta-ibm rev: f11928baab0df3b845f59786ec934e8fb7272b4d)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I05040555fc98808cf00db150f7dcfcfab807b9da
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
index 43a20c0..89f8e35 100644
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
+++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
@@ -16,10 +16,11 @@
inherit phosphor-dbus-yaml
DEPENDS += " \
- ibm-dbus-interfaces \
- phosphor-logging \
- nlohmann-json \
+ ${PYTHON_PN}-pyyaml-native \
autoconf-archive-native \
+ ibm-dbus-interfaces \
+ nlohmann-json \
+ phosphor-logging \
sdbusplus \
"
@@ -58,19 +59,10 @@
${S}/create_error_reports.py \
-p ${D}/${datadir}/ibm-logging/policy.json \
- -y ${STAGING_DIR_NATIVE}${yaml_dir} \
+ -y ${STAGING_DIR_TARGET}${yaml_dir} \
-e ${WORKDIR}/build/all_errors.json \
-x ${WORKDIR}/build/policy_crosscheck.txt
}
-addtask report
-
-#Collect all of the error YAML files into our recipe-sysroot-native dir.
-do_report[depends] = " \
- ibm-logging:do_install \
- phosphor-logging-error-logs-native:do_populate_sysroot \
- phosphor-dbus-interfaces-native:do_populate_sysroot \
- openpower-occ-control-native:do_populate_sysroot \
- openpower-debug-collector-native:do_populate_sysroot \
- "
+addtask report after do_install