diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb')
-rw-r--r-- | meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7e36d7871..cf068c9d7 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" @@ -56,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "0649b985860f7e0dc75e044f4b7598b767c94a9f" +SRCREV = "1ab6696f0103d60ffb398b45d3fcd1afeeff6a4e" S = "${WORKDIR}/git" @@ -98,7 +97,7 @@ PACKAGECONFIG[openpower-pels] = " \ --enable-openpower-pel-extension, \ --disable-openpower-pel-extension, \ nlohmann-json nlohmann-fifo cli11 pldm, \ - , \ + python3, \ " # Enable install_scripts during native and native SDK build @@ -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 \ " |