From 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:57:33 -0400 Subject: Convert to new override syntax This is mostly the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. A few minor fixups were done by hand afterwards during a review of the changes. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray Change-Id: I0bbae97331abee1367b368ce54ab39e3162a12ec --- .../alexa-voiceagent-service/alexa-voice-high-config_1.0.bb | 2 +- .../alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb | 2 +- .../alexa-voiceagent-service/alexa-voiceagent-service_git.bb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-speech-framework/meta-aac/recipes-apis') diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb index 736a7ce5..6b0203a9 100644 --- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb @@ -16,5 +16,5 @@ do_install () { install -D -m 644 ${WORKDIR}/voice-high.json ${D}${sysconfdir}/xdg/AGL/voice-high.json } -RPROVIDES_${PN} += "virtual/voice-high-config" +RPROVIDES:${PN} += "virtual/voice-high-config" diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb index a16ad182..13d259b8 100644 --- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb @@ -48,4 +48,4 @@ do_install () { install -D -m 644 ${WORKDIR}/AlexaAutoCoreEngineConfig.json ${D}${sysconfdir}/xdg/AGL/AlexaAutoCoreEngineConfig.json } -RPROVIDES_${PN} += "virtual/alexa-voiceagent-config" +RPROVIDES:${PN} += "virtual/alexa-voiceagent-config" diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb index 580b141c..c08377cd 100644 --- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb @@ -38,17 +38,17 @@ EXTRA_OECMAKE += "-DAAC_HOME=${RECIPE_SYSROOT}/${AAC_PREFIX}" ALEXA_WAKEWORD ??= "false" -do_install_append() { +do_install:append() { install -D -m 0644 ${WORKDIR}/alexa.json ${D}${sysconfdir}/xdg/AGL/voiceagents/alexa.json } PACKAGES =+ "${PN}-conf" -FILES_${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*" +FILES:${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*" # NOTE: curl and opus are from the base SDK libraries, sqlite3 from the # core module -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libcurl \ libopus \ libsqlite3 \ -- cgit 1.2.3-korg