diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2021-09-02 00:33:36 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-09-04 02:47:19 +0300 |
commit | 5b587cab386c4691eefa4885b9fd30794934c106 (patch) | |
tree | 9502dd5d3103b13ca91d7400056aa8d7d8800825 | |
parent | d9f7771a068f7e4b12fc4f77e49c56f26cf275d3 (diff) | |
download | openbmc-5b587cab386c4691eefa4885b9fd30794934c106.tar.xz |
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 <patrick@stwcx.xyz>
Change-Id: Ib1fe3cce57a0130378af789abd83b457e0c3a318
4 files changed, 7 insertions, 7 deletions
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index 9360e2128f..2ca97e1656 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -30,7 +30,7 @@ install_concurrent_console_config() { SRC_URI:append:p10bmc = " file://client.2201.conf" SRC_URI:append:p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ @@ -48,7 +48,7 @@ do_install:append:p10bmc() { SRC_URI:append:witherspoon-tacoma = " file://client.2201.conf" SRC_URI:append:witherspoon-tacoma = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:witherspoon-tacoma = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 659eafd74d..8e06233b0e 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -5,5 +5,5 @@ EXTRA_OEMESON:append = " \ inherit obmc-phosphor-discovery-service -REGISTERED_SERVICES_${PN} += "obmc_redfish:tcp:443:" -REGISTERED_SERVICES_${PN} += "obmc_rest:tcp:443:" +REGISTERED_SERVICES:${PN} += "obmc_redfish:tcp:443:" +REGISTERED_SERVICES:${PN} += "obmc_rest:tcp:443:" diff --git a/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass b/meta-phosphor/classes/obmc-phosphor-discovery-service.bbclass index 4afd9e0bd5..5b12faa4d0 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 diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 70d2fe99b9..62efcdb896 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -29,7 +29,7 @@ SRC_URI += "file://${BPN}.conf" SRCREV = "cabd9db06da91ecf2198c1baaf20360d1424c2f3" PV = "1.0+git${SRCPV}" -REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200:" +REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ obmc-console-ssh.socket \ |