summaryrefslogtreecommitdiffstats
path: root/meta-agl-devel/meta-speech-framework
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-devel/meta-speech-framework')
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc4
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc5
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/layer.conf2
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch286
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb1
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch24
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend3
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend4
-rw-r--r--meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb11
-rw-r--r--meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb2
-rw-r--r--meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb3
-rw-r--r--meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend5
-rw-r--r--meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb14
13 files changed, 346 insertions, 18 deletions
diff --git a/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc b/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
index ee19d25f..700aadf1 100644
--- a/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
+++ b/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
@@ -1 +1,5 @@
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-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
index 10df0926..21da324e 100644
--- a/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ b/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
@@ -2,6 +2,11 @@
# from meta-aac to avoid triggering rebuilds of all curl dependencies when
# agl-voiceagent-alexa is configured.
BBMASK += "meta-aac/recipes-support/curl/curl_%.bbappend"
+# Mask out the nghttp2 recipe in meta-aac as well, since the same version
+# is available in meta-networking, and due to meta-aac having a higher
+# layer priority, rebuilds will be triggered when the voiceagent feature
+# is configured and the layer is added.
+BBMASK += "meta-aac/recipes-connectivity/nghttp2"
PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"
diff --git a/meta-agl-devel/meta-speech-framework/conf/layer.conf b/meta-agl-devel/meta-speech-framework/conf/layer.conf
index ce97b9e0..b3f004ce 100644
--- a/meta-agl-devel/meta-speech-framework/conf/layer.conf
+++ b/meta-agl-devel/meta-speech-framework/conf/layer.conf
@@ -24,4 +24,4 @@ BBFILE_COLLECTIONS += "speech-framework"
BBFILE_PATTERN_speech-framework = "^${LAYERDIR}/"
BBFILE_PRIORITY_speech-framework = "8"
-LAYERSERIES_COMPAT_speech-framework = "thud"
+LAYERSERIES_COMPAT_speech-framework = "dunfell"
diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch
new file mode 100644
index 00000000..5886709b
--- /dev/null
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch
@@ -0,0 +1,286 @@
+Add autobuild scripts
+
+Add autobuild scripts and update .gitignore to not ignore them.
+The autobuild/agl/autobuild script will be required for building widgets
+in AGL, add the latest version to the voiceagent source tree.
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
+diff --git a/.gitignore b/.gitignore
+index b3c1108..edbf1b5 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,3 +1,2 @@
+-autobuild/
+ build/
+ alexa-voiceagent-apidef.h
+diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
+new file mode 100755
+index 0000000..16181b8
+--- /dev/null
++++ b/autobuild/agl/autobuild
+@@ -0,0 +1,128 @@
++#!/usr/bin/make -f
++# Copyright (C) 2015 - 2018 "IoT.bzh"
++# Copyright (C) 2020 Konsulko Group
++# Author "Romain Forlot" <romain.forlot@iot.bzh>
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++THISFILE := $(lastword $(MAKEFILE_LIST))
++ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
++
++# Build directories
++# Note that the debug/test/coverage directories are defined in relation
++# to the release directory (BUILD_DIR), this needs to be kept in mind
++# if over-riding it and building those widget types, the specific widget
++# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
++# to yield the desired output hierarchy.
++BUILD_DIR = $(ROOT_DIR)/build
++BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
++BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
++BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
++
++# Output directory variable for use in pattern rules.
++# This is intended for internal use only, hence the explicit override
++# definition.
++override OUTPUT_DIR = $(BUILD_DIR)
++
++# Final install directory for widgets
++DEST = $(OUTPUT_DIR)
++
++# Default build type for release/test builds
++BUILD_TYPE = RELEASE
++
++.PHONY: all help update install distclean
++.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
++.PHONY: configure configure-release configure-debug configure-test configure-coverage
++.PHONY: build build-release build-debug build-test build-coverage build-all
++.PHONY: package package-release package-debug package-test package-coverage package-all
++
++help:
++ @echo "List of targets available:"
++ @echo ""
++ @echo "- all"
++ @echo "- help"
++ @echo "- clean"
++ @echo "- distclean"
++ @echo "- configure"
++ @echo "- build: compilation, link and prepare files for package into a widget"
++ @echo "- package: output a widget file '*.wgt'"
++ @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory"
++ @echo ""
++ @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
++ @echo "Don't use your build dir as DEST as wgt file is generated at this location"
++
++all: package-all
++
++# Target specific variable over-rides so static pattern rules can be
++# used for the various type-specific targets.
++
++configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST)
++
++configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE)
++configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE
++
++configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
++configure-debug build-debug package-debug: BUILD_TYPE = DEBUG
++
++clean-release clean-test clean-debug clean-coverage:
++ @if [ -d $(OUTPUT_DIR) ]; then \
++ $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
++ else \
++ echo Nothing to clean; \
++ fi
++
++clean: clean-release
++
++clean-all: clean-release clean-test clean-debug clean-coverage
++
++distclean: clean-all
++
++configure-release configure-test configure-debug configure-coverage:
++ @mkdir -p $(OUTPUT_DIR)
++ @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
++ (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \
++ fi
++
++configure: configure-release
++
++build-release build-debug build-coverage: build-%: configure-%
++ @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all
++
++# Kept for consistency, empty to avoid building everything for test widget
++build-test: configure-test
++
++build: build-release
++
++build-all: build-release build-debug build-test build-coverage
++
++package-release package-debug package-coverage: package-%: build-%
++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget
++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
++ fi
++
++package-test: build-test
++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget
++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
++ fi
++
++package: package-release
++
++package-all: package-release package-test package-coverage package-debug
++
++update: configure
++ @cmake --build $(BUILD_DIR) --target autobuild
++
++install: build
++ @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install
+diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
+new file mode 100755
+index 0000000..16181b8
+--- /dev/null
++++ b/autobuild/linux/autobuild
+@@ -0,0 +1,128 @@
++#!/usr/bin/make -f
++# Copyright (C) 2015 - 2018 "IoT.bzh"
++# Copyright (C) 2020 Konsulko Group
++# Author "Romain Forlot" <romain.forlot@iot.bzh>
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++THISFILE := $(lastword $(MAKEFILE_LIST))
++ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
++
++# Build directories
++# Note that the debug/test/coverage directories are defined in relation
++# to the release directory (BUILD_DIR), this needs to be kept in mind
++# if over-riding it and building those widget types, the specific widget
++# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified
++# to yield the desired output hierarchy.
++BUILD_DIR = $(ROOT_DIR)/build
++BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
++BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test)
++BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage)
++
++# Output directory variable for use in pattern rules.
++# This is intended for internal use only, hence the explicit override
++# definition.
++override OUTPUT_DIR = $(BUILD_DIR)
++
++# Final install directory for widgets
++DEST = $(OUTPUT_DIR)
++
++# Default build type for release/test builds
++BUILD_TYPE = RELEASE
++
++.PHONY: all help update install distclean
++.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all
++.PHONY: configure configure-release configure-debug configure-test configure-coverage
++.PHONY: build build-release build-debug build-test build-coverage build-all
++.PHONY: package package-release package-debug package-test package-coverage package-all
++
++help:
++ @echo "List of targets available:"
++ @echo ""
++ @echo "- all"
++ @echo "- help"
++ @echo "- clean"
++ @echo "- distclean"
++ @echo "- configure"
++ @echo "- build: compilation, link and prepare files for package into a widget"
++ @echo "- package: output a widget file '*.wgt'"
++ @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory"
++ @echo ""
++ @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
++ @echo "Don't use your build dir as DEST as wgt file is generated at this location"
++
++all: package-all
++
++# Target specific variable over-rides so static pattern rules can be
++# used for the various type-specific targets.
++
++configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST)
++
++configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE)
++configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE
++
++configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
++configure-debug build-debug package-debug: BUILD_TYPE = DEBUG
++
++clean-release clean-test clean-debug clean-coverage:
++ @if [ -d $(OUTPUT_DIR) ]; then \
++ $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
++ else \
++ echo Nothing to clean; \
++ fi
++
++clean: clean-release
++
++clean-all: clean-release clean-test clean-debug clean-coverage
++
++distclean: clean-all
++
++configure-release configure-test configure-debug configure-coverage:
++ @mkdir -p $(OUTPUT_DIR)
++ @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
++ (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \
++ fi
++
++configure: configure-release
++
++build-release build-debug build-coverage: build-%: configure-%
++ @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all
++
++# Kept for consistency, empty to avoid building everything for test widget
++build-test: configure-test
++
++build: build-release
++
++build-all: build-release build-debug build-test build-coverage
++
++package-release package-debug package-coverage: package-%: build-%
++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget
++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
++ fi
++
++package-test: build-test
++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget
++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
++ fi
++
++package: package-release
++
++package-all: package-release package-test package-coverage package-debug
++
++update: configure
++ @cmake --build $(BUILD_DIR) --target autobuild
++
++install: build
++ @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install
diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
index f0211552..abae3dec 100644
--- a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
@@ -28,6 +28,7 @@ SRC_URI = "git://github.com/alexa/alexa-auto-sdk.git;protocol=https;branch=2.0 \
file://0004-update-config-and-database-paths.patch \
file://0005-fix-segmentation-fault-for-release-build-mode.patch \
file://0006-fix-event-argument-json.patch \
+ file://0007-add-autobuild-scripts.patch \
"
SRCREV = "86916d2d8c1702a8be3c88a9012ca56583bcc0c8"
diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch
new file mode 100644
index 00000000..0e4f14fd
--- /dev/null
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch
@@ -0,0 +1,24 @@
+Enable building with g++ 9.x
+
+Disable -Werror for new warning "deprecated-copy" to avoid build
+failure in the packaged copy of googletest with g++ 9.x. This is
+hopefully temporary until googletest is upgraded or it becomes
+straightforward to build against an externally provided copy.
+
+Upstream-Status: pending
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
+diff --git a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
+index 777b91e..7832f20 100644
+--- a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
++++ b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
+@@ -91,7 +91,7 @@ macro(config_compiler_and_linker)
+ set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0")
+ set(cxx_no_rtti_flags "-GR-")
+ elseif (CMAKE_COMPILER_IS_GNUCXX)
+- set(cxx_base_flags "-Wall -Wshadow")
++ set(cxx_base_flags "-Wall -Wshadow -Wno-error=deprecated-copy")
+ set(cxx_exception_flags "-fexceptions")
+ set(cxx_no_exception_flags "-fno-exceptions")
+ # Until version 4.3.2, GCC doesn't define a macro to indicate
diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend
new file mode 100644
index 00000000..8afb91a9
--- /dev/null
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI += "file://0001-enable-building-with-g++-9.patch"
diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend
deleted file mode 100644
index 43836942..00000000
--- a/meta-agl-devel/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-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
index 5f38e7ef..4b4016af 100644
--- a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
@@ -6,10 +6,9 @@ LICENSE = "MIT"
inherit packagegroup
PACKAGES = "\
- packagegroup-agl-voiceagent-alexa \
-"
+ packagegroup-agl-voiceagent-alexa \
+ "
-RDEPENDS_${PN} += " \
- alexa-voiceagent-service \
- ${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", "virtual/alexa-voiceagent-config", "",d)} \
-"
+RDEPENDS_${PN} = " \
+ alexa-voiceagent-service \
+ "
diff --git a/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb b/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
index 6ab4da9c..0ab1f3d8 100644
--- a/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
+++ b/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://git.automotivelinux.org/apps/agl-service-voice-high-capabili
SECTION = "apps"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEPENDS = "libafb-helpers libappcontroller nlohmann-json"
diff --git a/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb b/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
index b8ee77fd..b3c782bb 100644
--- a/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
+++ b/meta-agl-devel/meta-speech-framework/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-hig
SECTION = "apps"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEPENDS = "json-c systemd af-binder libafb-helpers libappcontroller nlohmann-json glib-2.0"
@@ -16,3 +16,4 @@ S = "${WORKDIR}/git"
inherit cmake aglwgt
+RDEPENDS_${PN} += "virtual/voice-high-config"
diff --git a/meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend b/meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bbappend
deleted file mode 100644
index 7e918671..00000000
--- a/meta-agl-devel/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-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
new file mode 100644
index 00000000..8dd97f39
--- /dev/null
+++ b/meta-agl-devel/meta-speech-framework/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
@@ -0,0 +1,14 @@
+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} \
+"