diff options
7 files changed, 56 insertions, 15 deletions
diff --git a/meta-speech-framework/conf/include/agl-speech-framework.inc b/meta-speech-framework/conf/include/agl-speech-framework.inc index ee19d25f..563a994d 100644 --- a/meta-speech-framework/conf/include/agl-speech-framework.inc +++ b/meta-speech-framework/conf/include/agl-speech-framework.inc @@ -1 +1,10 @@ PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config" + +FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services" + +IMAGE_FEATURES += "agl-speech-framework" + +# Add local packagegroups to agl-test-wgt and agl-devel-wgt image feature +# package lists +FEATURE_PACKAGES_agl-test-wgt_append = " packagegroup-agl-speech-services-test" +FEATURE_PACKAGES_agl-devel-wgt_append = " packagegroup-agl-speech-services-devel" diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc index 21da324e..db2774d4 100644 --- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc +++ b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc @@ -13,3 +13,8 @@ PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config" FEATURE_PACKAGES_agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa" IMAGE_FEATURES += "agl-voiceagent-alexa" + +# Add local packagegroups to agl-test-wgt and agl-devel-wgt image feature +# package lists +FEATURE_PACKAGES_agl-test-wgt_append = " packagegroup-agl-voiceagent-alexa-test" +FEATURE_PACKAGES_agl-devel-wgt_append = " packagegroup-agl-voiceagent-alexa-devel" diff --git a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend deleted file mode 100644 index 43836942..00000000 --- a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -RDEPENDS_${PN} += " \ - alexa-voiceagent-service \ - ${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", "virtual/alexa-voiceagent-config", "",d)} \ -" diff --git a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb index 5f38e7ef..6118dbf2 100644 --- a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb +++ b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb @@ -5,11 +5,19 @@ LICENSE = "MIT" inherit packagegroup +ALLOW_EMPTY_${PN} = "1" + +PROVIDES = "${PACKAGES}" PACKAGES = "\ - packagegroup-agl-voiceagent-alexa \ -" + packagegroup-agl-voiceagent-alexa \ + packagegroup-agl-voiceagent-alexa-test \ + packagegroup-agl-voiceagent-alexa-devel \ + " + +RDEPENDS_${PN} = " \ + alexa-voiceagent-service \ + " -RDEPENDS_${PN} += " \ - alexa-voiceagent-service \ - ${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", "virtual/alexa-voiceagent-config", "",d)} \ -" +# Empty for now, no test/dbg/coverage widgets +RDEPENDS_${PN}-test = "" +RDEPENDS_${PN}-devel = "" diff --git a/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb b/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb index b8ee77fd..b885c15b 100644 --- a/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb +++ b/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb @@ -16,3 +16,4 @@ S = "${WORKDIR}/git" inherit cmake aglwgt +RDEPENDS_${PN} += "virtual/voice-high-config" diff --git a/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend b/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend deleted file mode 100644 index 7e918671..00000000 --- a/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -RDEPENDS_${PN} += " \ - agl-service-voice-high \ - agl-service-voice-high-capabilities \ - ${PREFERRED_RPROVIDER_virtual/voice-high-config} \ -" diff --git a/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb new file mode 100644 index 00000000..b4b1997e --- /dev/null +++ b/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "The set of packages for AGL Speech Subsystem" +LICENSE = "MIT" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = "\ + packagegroup-agl-speech-services \ + packagegroup-agl-speech-services-test \ + packagegroup-agl-speech-services-devel \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + agl-service-voice-high \ + agl-service-voice-high-capabilities \ + ${PREFERRED_RPROVIDER_virtual/voice-high-config} \ +" + +RDEPENDS_${PN}-test = "\ + agl-service-voice-high-test \ + agl-service-voice-high-capabilities-test \ +" + +# Empty until service autobuild script rework +RDEPENDS_${PN}-devel = "" |