From ba3c28a56b99e5628041d772b4faa36553846c21 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 28 Apr 2020 21:12:10 +0000 Subject: Widget packaging rework Changes include: - Created new packagegroup-agl-speech-services packagegroup and associated test and devel packagegroups to replace previous extending of packagegroup-agl-ivi-services via bbappend. This makes it simpler to create the test/devel packagegroups in packagegroup-agl-ivi-services, and is cleaner with respect to the packagefeed since it avoids modifying a packagegroup in another layer. - Extend the agl-devel-wgt and agl-test-wgt FEATURE_PACKAGES variables as necessary to add the required corresponding widget packagegroups. Bug-AGL: SPEC-3300 Signed-off-by: Scott Murray Change-Id: I17b61f3e4549a7baa8ac1a6f9c857e2f78bb6448 --- .../packagegroup-agl-ivi-services.bbappend | 4 ---- .../packagegroup-agl-voiceagent-alexa.bb | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend (limited to 'meta-speech-framework/meta-aac/recipes-platform/packagegroups') 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 = "" -- cgit 1.2.3-korg