diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-06 17:16:53 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 00:56:33 +0300 |
commit | 12fc939cde971ea2094201e48fe095c41138f4aa (patch) | |
tree | 2fc49b7224d97fc0e43011cc3d9c85eaa933d0a9 /meta-phosphor/recipes-phosphor/logging | |
parent | 9b3d987c3c2facf75e1039766d31fbf31508fc19 (diff) | |
download | openbmc-12fc939cde971ea2094201e48fe095c41138f4aa.tar.xz |
meta-phosphor: prep for new override syntax
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
Diffstat (limited to 'meta-phosphor/recipes-phosphor/logging')
3 files changed, 13 insertions, 13 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index f6ee824a8..3b05b9e02 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -7,7 +7,7 @@ require recipes-phosphor/dump/phosphor-debug-collector.inc DEPENDS += "systemd" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${VIRTUAL-RUNTIME_base-utils} \ " diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 5ad350d67..5e81a0d7f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -16,8 +16,8 @@ DEPENDS += " \ phosphor-logging \ zlib \ " -RDEPENDS_${PN} += "obmc-console" -RRECOMMENDS_${PN} += "phosphor-debug-collector" +RDEPENDS:${PN} += "obmc-console" +RRECOMMENDS:${PN} += "phosphor-debug-collector" # Source code repository S = "${WORKDIR}/git" @@ -29,7 +29,7 @@ EXTRA_OEMESON += "-Dtests=disabled" # Systemd service template SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "hostlogger@.service" +SYSTEMD_SERVICE:${PN} = "hostlogger@.service" # Default service instance to install (single-host mode) DEFAULT_INSTANCE = "ttyVUART0" @@ -42,7 +42,7 @@ CUSTOM_CONFIGS = "${@custom_configs('${WORKDIR}')}" CUSTOM_SERVICES = "${@custom_services('${CUSTOM_CONFIGS}')}" # Preset systemd units -SYSTEMD_SERVICE_${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ +SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ else '${DEFAULT_SERVICE}'}" # Gets list of custom config files in a directory @@ -55,7 +55,7 @@ def custom_services(configs): return ' '.join(['hostlogger@' + i.replace('.conf', '.service') \ for i in configs.split()]) -do_install_append() { +do_install:append() { # Install config files if [ -n "${CUSTOM_CONFIGS}" ]; then for CONFIG_FILE in ${CUSTOM_CONFIGS}; do diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 6e9d4068b..5020f9ce5 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -26,7 +26,7 @@ DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" PACKAGE_BEFORE_PN = "${PN}-test" -FILES_${PN}-test = "${bindir}/*-test" +FILES:${PN}-test = "${bindir}/*-test" # Package configuration LOGGING_PACKAGES = " \ @@ -34,22 +34,22 @@ LOGGING_PACKAGES = " \ phosphor-rsyslog-config \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}" DBUS_PACKAGES = "${LOGGING_PACKAGES}" USERADD_PACKAGES = "${PN}-base" -GROUPADD_PARAM_${PN}-base = "-r phosphor-logging" +GROUPADD_PARAM:${PN}-base = "-r phosphor-logging" -FILES_${PN}-base += " \ +FILES:${PN}-base += " \ ${datadir}/dbus-1 \ ${bindir}/phosphor-log-manager \ ${libdir}/libphosphor_logging.so.* \ " -DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service" +DBUS_SERVICE:${PN}-base += "xyz.openbmc_project.Logging.service" -DBUS_SERVICE_phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" -FILES_phosphor-rsyslog-config += " \ +DBUS_SERVICE:phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" +FILES:phosphor-rsyslog-config += " \ ${bindir}/phosphor-rsyslog-conf \ " |