diff options
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 9360e2128..2ca97e165 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 659eafd74..8e06233b0 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 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 diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 70d2fe99b..62efcdb89 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 \ |