diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-02-08 21:34:24 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-02-08 23:31:50 +0300 |
| commit | 7589c79ffd68976cc1fbe8f927b8a2bca0e3b8ad (patch) | |
| tree | ca9300f66115a9ebd15d6784d418e463eb6b3922 /meta-phosphor/classes | |
| parent | fd67cd2477046e0c3d7290fcbe53745287534197 (diff) | |
| download | openbmc-7589c79ffd68976cc1fbe8f927b8a2bca0e3b8ad.tar.xz | |
meta-phosphor: logging-yaml-provider: allow 'yaml' subdirs
Most repositories now put their dbus and phosphor-logging YAML into
a `yaml` subdirectory. Enhance the bbclass to support either in the
root or in the `yaml` subdirectory.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I30a104088d4ac9696e9072b33ec8e91c4a718f10
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass b/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass index f51e262b8b..0f550cf218 100644 --- a/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass +++ b/meta-phosphor/classes/phosphor-logging-yaml-provider.bbclass @@ -5,15 +5,21 @@ LOGGING_YAML_SUBDIRS ??= "${OBMC_ORG_YAML_SUBDIRS}" do_install:append() { for yaml_d in ${LOGGING_YAML_SUBDIRS} ; do - if [ ! -d ${S}/${yaml_d} ]; + if [ -d ${S}/${yaml_d} ]; then + yaml_base=${S} + elif [ -d ${S}/yaml/${yaml_d} ]; + then + yaml_base=${S}/yaml + else continue fi - for yaml_f in $(find ${S}/${yaml_d} -name "*.errors.yaml" -or \ + + for yaml_f in $(find ${yaml_base}/${yaml_d} -name "*.errors.yaml" -or \ -name "*.metadata.yaml") ; do - subpath=$(realpath --relative-to=${S} ${yaml_f}) + subpath=$(realpath --relative-to=${yaml_base} ${yaml_f}) install -d $(dirname ${D}${yaml_dir}/$subpath) install -m 0644 ${yaml_f} ${D}${yaml_dir}/$subpath |