diff options
| -rw-r--r-- | meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass | 2 | ||||
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass b/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass index f18adbbadd..89d031caaf 100644 --- a/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass +++ b/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass @@ -1,6 +1,6 @@ inherit phosphor-dbus-yaml -LOGGING_YAML_SUBDIRS ??= "xyz/openbmc_project" +LOGGING_YAML_SUBDIRS ??= "${OBMC_ORG_YAML_SUBDIRS}" do_install_append() { for yaml_d in ${LOGGING_YAML_SUBDIRS} ; diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 297b2d31ff..4da31b78f9 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -143,3 +143,9 @@ BAD_RECOMMENDATIONS += "shared-mime-info" LAYER_CONF_VERSION ?= "8" KERNEL_CLASSES_append = " obmc-phosphor-kernel-version" + +# Some packages have directory trees of YAML files arranged based on +# canonical organization names. 'xyz/openbmc_project' should be used +# everywhere in phosphor, but some layers may append this with their +# own organization(s). +OBMC_ORG_YAML_SUBDIRS += " xyz/openbmc_project" |