phosphor-base.inc: add var for automatic YAML subdirs
Some packages have directory trees of YAML files arranged based on
canonical organization names. See
phosphor-logging-yaml-providers.bbclass as an example.
Add a variable that can be appended to by a layer to limit the number
of 'bbappends' that are necessary in a layer to add their
layer-specific organizations to all the YAML processing recipes.
(From meta-phosphor rev: 2f31e7a7a37f841c1b2586e92258a7759b36306f)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie4754ba96a4542ce813869a1384b44ab88000be0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass b/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass
index f18adbb..89d031c 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 297b2d3..4da31b7 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -143,3 +143,9 @@
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"