From 7b362a078e50e3c3a5784178853ab141bc706b09 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 13 May 2020 19:46:59 -0400 Subject: Update widget packaging rework To match the update in meta-agl, rework to drop the agl-test-wgt and agl-devel-wgt feature package additions and now unnecessary test/devel packagegroups. They'll now be pulled in by the COMPLEMENTARY_GLOBS definitions for those image features. Bug-AGL: SPEC-3300, SPEC-3375 Signed-off-by: Scott Murray Change-Id: I61c07efad927809a29990d76e52f8f6f24e4e26b --- meta-speech-framework/conf/include/agl-speech-framework.inc | 5 ----- meta-speech-framework/conf/include/agl-voiceagent-alexa.inc | 5 ----- .../packagegroups/packagegroup-agl-voiceagent-alexa.bb | 9 --------- .../packagegroups/packagegroup-agl-speech-services.bb | 13 ------------- 4 files changed, 32 deletions(-) (limited to 'meta-speech-framework') diff --git a/meta-speech-framework/conf/include/agl-speech-framework.inc b/meta-speech-framework/conf/include/agl-speech-framework.inc index 563a994d..700aadf1 100644 --- a/meta-speech-framework/conf/include/agl-speech-framework.inc +++ b/meta-speech-framework/conf/include/agl-speech-framework.inc @@ -3,8 +3,3 @@ 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 db2774d4..21da324e 100644 --- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc +++ b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc @@ -13,8 +13,3 @@ 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-voiceagent-alexa.bb b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb index 6118dbf2..4b4016af 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,19 +5,10 @@ LICENSE = "MIT" inherit packagegroup -ALLOW_EMPTY_${PN} = "1" - -PROVIDES = "${PACKAGES}" PACKAGES = "\ packagegroup-agl-voiceagent-alexa \ - packagegroup-agl-voiceagent-alexa-test \ - packagegroup-agl-voiceagent-alexa-devel \ " RDEPENDS_${PN} = " \ alexa-voiceagent-service \ " - -# Empty for now, no test/dbg/coverage widgets -RDEPENDS_${PN}-test = "" -RDEPENDS_${PN}-devel = "" 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 index b4b1997e..8dd97f39 100644 --- a/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb +++ b/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb @@ -3,25 +3,12 @@ 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 = "" -- cgit 1.2.3-korg