From 891b144d7a9ddef6ac5881c0a7bdf4eba1fe36c3 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 12 Jun 2020 06:04:25 -0500 Subject: 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 Change-Id: Ie4754ba96a4542ce813869a1384b44ab88000be0 Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass | 2 +- meta-phosphor/conf/distro/include/phosphor-base.inc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') 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" -- cgit v1.2.3