From 5b587cab386c4691eefa4885b9fd30794934c106 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:33:36 -0500 Subject: meta-phosphor: make discovery bbclass use override syntax In the spirit of consistency with the new upstream override syntax, change phosphor-discovery-service.bbclass to use it and make tree-wide changes as appropriate. After the change checked on Witherspoon on QEMU: ``` root@witherspoon:/etc/avahi/services# ls obmc_console.service obmc_redfish.service obmc_rest.service ``` Signed-off-by: Patrick Williams Change-Id: Ib1fe3cce57a0130378af789abd83b457e0c3a318 --- meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass') diff --git a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass index 4afd9e0bd..5b12faa4d 100644 --- a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass @@ -24,7 +24,7 @@ python() { for pkg in listvar_to_list(d, 'DISCOVERY_SVC_PACKAGES'): - for service in listvar_to_list(d, 'REGISTERED_SERVICES_%s' % pkg): + for service in listvar_to_list(d, 'REGISTERED_SERVICES:%s' % pkg): if avahi_enabled: set_doappend(d, 'RRECOMMENDS:%s' % pkg, 'avahi-daemon') svc_name, svc_type, svc_port, svc_txt_data = service.split(':') @@ -95,7 +95,7 @@ python discovery_services_postinstall() { fd.write('%s %s %s' % (service_name, service_type, service_port)) def register_services(d,pkg): - for service in listvar_to_list(d, 'REGISTERED_SERVICES_%s' % pkg): + for service in listvar_to_list(d, 'REGISTERED_SERVICES:%s' % pkg): svc_info = service.split(":") try: svc_name, svc_type, svc_port, svc_txt_data = svc_info -- cgit v1.2.3