Move core speech service to meta-agl-demo

This moves the generic agl-speechframework to meta-agl-demo.
The alexa-voiceagent bits remain in meta-agl-devel for now.

This fixes a dependency of the settings app.

Bug-AGL: SPEC-3734
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I3b0c81bd598ef20c2cb6fcec054c399dc6c3d97b

diff --git a/meta-speech-framework/conf/include/agl-speech-framework.inc b/meta-speech-framework/conf/include/agl-speech-framework.inc
deleted file mode 100644 (file)
index 700aadf..0000000
--- a/meta-speech-framework/conf/include/agl-speech-framework.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
-
-FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
-
-IMAGE_FEATURES += "agl-speech-framework"

diff --git a/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb b/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
deleted file mode 100644 (file)
index 0ab1f3d..0000000
--- a/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "agl-service-voice-high"
-DESCRIPTION = "AGL High Level Voice service"
-HOMEPAGE = "https://git.automotivelinux.org/apps/agl-service-voice-high-capabilities"
-SECTION = "apps"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS = "libafb-helpers libappcontroller nlohmann-json"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-high-capabilities.git;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-PV = "0.1+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit cmake pkgconfig aglwgt

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
deleted file mode 100644 (file)
index b3c782b..0000000
--- a/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "High level voice service binding"
-DESCRIPTION = "agl-service-voice-high is the binding library"
-HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-high"
-SECTION = "apps"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS = "json-c systemd af-binder libafb-helpers libappcontroller nlohmann-json glib-2.0"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-high;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit cmake aglwgt
-
-RDEPENDS_${PN} += "virtual/voice-high-config"

diff --git a/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json b/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json
deleted file mode 100644 (file)
index 1b72b8c..0000000
--- a/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "default": "" }

diff --git a/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb b/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
deleted file mode 100644 (file)
index b015dd5..0000000
--- a/meta-speech-framework/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "High level voice service binding default voiceagent configuration"
-DESCRIPTION = "Default voiceagent JSON configuration file for agl-service-voice-high binding"
-HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-high"
-SECTION = "apps"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-SRC_URI = "file://voice-high.json"
-
-inherit allarch
-
-do_compile[noexec] = "1"
-
-do_install () {
-    install -D -m 644 ${WORKDIR}/voice-high.json ${D}${sysconfdir}/xdg/AGL/voice-high.json
-}
-
-RPROVIDES_${PN} += "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
deleted file mode 100644 (file)
index 8dd97f3..0000000
--- a/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "The set of packages for AGL Speech Subsystem"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-speech-services \
-    "
-
-RDEPENDS_${PN} += "\
-    agl-service-voice-high \
-    agl-service-voice-high-capabilities \
-    ${PREFERRED_RPROVIDER_virtual/voice-high-config} \
-"

diff --git a/templates/feature/agl-speech-framework/50_bblayers.conf.inc b/templates/feature/agl-speech-framework/50_bblayers.conf.inc
deleted file mode 100644 (file)
index 60f88c9..0000000
--- a/templates/feature/agl-speech-framework/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-BBLAYERS =+ " \
-       ${METADIR}/meta-agl-devel/meta-speech-framework \
-       "
-

diff --git a/templates/feature/agl-speech-framework/50_local.conf.inc b/templates/feature/agl-speech-framework/50_local.conf.inc
deleted file mode 100644 (file)
index c542f38..0000000
--- a/templates/feature/agl-speech-framework/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
-require conf/include/agl-speech-framework.inc

diff --git a/templates/feature/agl-speech-framework/README_feature_agl-speech-framework.md b/templates/feature/agl-speech-framework/README_feature_agl-speech-framework.md
deleted file mode 100644 (file)
index ca6acdb..0000000
--- a/templates/feature/agl-speech-framework/README_feature_agl-speech-framework.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-speech-framework
-authors: Shotaro Uchida <shotaru@amazon.com>
----
-       
-### Feature agl-speech-framework
-        
-*Description is missing - please complete file meta-agl-devel/templates/feature/agl-speech-framework/README_feature_agl-speech-framework.md*
-

diff --git a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
index dc6c1f6..c32a0f6 100644 (file)
--- a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
+++ b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
@@ -1,4 +1,5 @@
 BBLAYERS =+ " \
+       ${METADIR}/meta-agl-devel/meta-speech-framework \
        ${METADIR}/external/alexa-auto-sdk/builder/meta-aac \
 "
 

diff --git a/templates/feature/agl-voiceagent-alexa/included.dep b/templates/feature/agl-voiceagent-alexa/included.dep
deleted file mode 100644 (file)
index fde3c2d..0000000
--- a/templates/feature/agl-voiceagent-alexa/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-speech-framework