From ccfac6e024b1404d9c9e59455bf58454533e8e51 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 14 Jun 2022 16:06:30 +0000 Subject: Feature cleanup for Nifty Needlefish Remove features with upstream deprecated or unmaintained: - meta-ros - agl-service-alexa and the voiceagent service Bug-AGL: SPEC-4407 Signed-off-by: Jan-Simon Moeller Change-Id: I8a1e3886897af5b2cf591d0952b1feb980b8708e --- templates/feature/agl-ros2/50_bblayers.conf.inc | 17 -------- templates/feature/agl-ros2/50_local.conf.inc | 8 ---- .../feature/agl-ros2/README_feature_agl-ros2.md | 8 ---- .../50_bblayers.conf.inc | 6 --- .../50_local.conf.inc | 1 - .../agl-voiceagent-alexa-wakeword/50_setup.sh | 45 ---------------------- ...README_feature_agl-voiceagent-alexa-wakeword.md | 15 -------- .../amazonlite-2.3.patch | 31 --------------- .../agl-voiceagent-alexa-wakeword/included.dep | 1 - .../agl-voiceagent-alexa/50_bblayers.conf.inc | 15 -------- .../feature/agl-voiceagent-alexa/50_local.conf.inc | 2 - .../README_feature_agl-voiceagent-alexa.md | 8 ---- 12 files changed, 157 deletions(-) delete mode 100644 templates/feature/agl-ros2/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-ros2/50_local.conf.inc delete mode 100644 templates/feature/agl-ros2/README_feature_agl-ros2.md delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/50_local.conf.inc delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/50_setup.sh delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/README_feature_agl-voiceagent-alexa-wakeword.md delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/amazonlite-2.3.patch delete mode 100644 templates/feature/agl-voiceagent-alexa-wakeword/included.dep delete mode 100644 templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-voiceagent-alexa/50_local.conf.inc delete mode 100644 templates/feature/agl-voiceagent-alexa/README_feature_agl-voiceagent-alexa.md (limited to 'templates') diff --git a/templates/feature/agl-ros2/50_bblayers.conf.inc b/templates/feature/agl-ros2/50_bblayers.conf.inc deleted file mode 100644 index 4f011f86..00000000 --- a/templates/feature/agl-ros2/50_bblayers.conf.inc +++ /dev/null @@ -1,17 +0,0 @@ -# agl-ros2 - -# Layer dependencies for meta-ros2 -# Add meta-ros layers : https://growupboron.github.io/blog/gsoc-weekly-update-week-2/ -# Add ydlidar-drivers : https://growupboron.github.io/blog/gsoc-weekly-update-week-4/ - -AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" - -BBLAYERS =+ " \ - ${METADIR}/external/meta-ros/meta-ros-common \ - ${METADIR}/external/meta-ros/meta-ros-backports-gatesgarth \ - ${METADIR}/external/meta-ros/meta-ros-backports-hardknott \ - ${METADIR}/external/meta-ros/meta-ros2 \ - ${METADIR}/external/meta-ros/meta-ros2-foxy \ - ${METADIR}/external/meta-qt5 \ - ${METADIR}/meta-agl-devel/meta-agl-ros2 \ - " \ No newline at end of file diff --git a/templates/feature/agl-ros2/50_local.conf.inc b/templates/feature/agl-ros2/50_local.conf.inc deleted file mode 100644 index 4ffa2cd1..00000000 --- a/templates/feature/agl-ros2/50_local.conf.inc +++ /dev/null @@ -1,8 +0,0 @@ -# agl-ros2 - -# Contains minimal ros2 feature that is neccesary to run YDLIDAR drivers. -IMAGE_INSTALL:append = " packagegroup-agl-ros2-minimal" -IMAGE_INSTALL:append = " packagegroup-agl-ros2-ydlidar" - -# Adds Qt support to the built image -IMAGE_INSTALL:append = " packagegroup-agl-ros-native-qt5" \ No newline at end of file diff --git a/templates/feature/agl-ros2/README_feature_agl-ros2.md b/templates/feature/agl-ros2/README_feature_agl-ros2.md deleted file mode 100644 index 8c7eccd5..00000000 --- a/templates/feature/agl-ros2/README_feature_agl-ros2.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -description: Feature agl-ros2 -authors: Shankho Boron Ghosh ---- - -### Feature agl-ros2 - -Enables building of meta-ros2-foxy layer with additional support for YDLIDAR drivers. \ No newline at end of file diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa-wakeword/50_bblayers.conf.inc deleted file mode 100644 index 31f4dca8..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/50_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/external/alexa-auto-sdk/extensions/extras/amazonlite/meta-aac-amazonlite \ -" - -# Include the recipe for the required module as well -BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/extras/amazonlite/modules/*/*.bb" diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/50_local.conf.inc b/templates/feature/agl-voiceagent-alexa-wakeword/50_local.conf.inc deleted file mode 100644 index 41af3db8..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -ALEXA_WAKEWORD = "true" diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/50_setup.sh b/templates/feature/agl-voiceagent-alexa-wakeword/50_setup.sh deleted file mode 100644 index 6e1d2503..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/50_setup.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Install and patch Amazon Alexa Auto SDK "amazonlite" wakeword engine - -pushd $METADIR >/dev/null 2>&1 - -WAKEWORD_FEATURE_DIR="$METADIR/meta-agl-devel/templates/feature/agl-voiceagent-alexa-wakeword" -AMAZONLITE_VER="2.3" -AMAZONLITE_PATCH="${WAKEWORD_FEATURE_DIR}/amazonlite-${AMAZONLITE_VER}.patch" -AUTOSDK_EXTRAS_DIR="$METADIR/external/alexa-auto-sdk/extensions/extras" -AMAZONLITE_DIR="${AUTOSDK_EXTRAS_DIR}/amazonlite" - -if [ -f "${AMAZONLITE_DIR}/README.md" ]; then - ver=`grep '^Unzip the' "${AMAZONLITE_DIR}/README.md" | sed 's/.*amazonlite-\([0-9]\+\.[0-9]\+\)\.zip.*/\1/'` - if [ "$ver" != ${AMAZONLITE_VER} ]; then - echo "ERROR: ${AMAZONLITE_DIR} does not contain version ${AMAZONLITE_VER}!" >&2 - exit 1 - fi -fi - -test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs -DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads} - -if [ ! -f "${DOWNLOAD_DIR}/amazonlite-${AMAZONLITE_VER}.zip" ]; then - echo "ERROR: amazonlite-${AMAZONLITE_VER}.zip not found in ${DOWNLOAD_DIR}!" >&2 - exit 1 -elif [ ! -d "${AUTOSDK_EXTRAS_DIR}" ]; then - echo "ERROR: Directory ${AUTOSDK_EXTRAS_DIR} not present!" >&2 - exit 1 -fi -cd "${AUTOSDK_EXTRAS_DIR}" -if [ ! -d amazonlite ]; then - echo "Extracting ${DOWNLOAD_DIR}/amazonlite-${AMAZONLITE_VER}.zip" - unzip -q "${DOWNLOAD_DIR}/amazonlite-${AMAZONLITE_VER}.zip" || exit 1 - cd amazonlite - echo "Patching ${AMAZONLITE_DIR}" - patch -p0 < "${AMAZONLITE_PATCH}" -else - cat <<-EOF -The amazonlite ${AMAZONLITE_VER} wakeword engine is already installed. -To force reinstallation, manually remove the directory: - ${AMAZONLITE_DIR} - -EOF -fi - -popd >/dev/null 2>&1 diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/README_feature_agl-voiceagent-alexa-wakeword.md b/templates/feature/agl-voiceagent-alexa-wakeword/README_feature_agl-voiceagent-alexa-wakeword.md deleted file mode 100644 index 4917a96f..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/README_feature_agl-voiceagent-alexa-wakeword.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -description: Feature agl-voiceagent-alexa-wakeword -authors: Scott Murray ---- - -### Feature agl-voiceagent-alexa-wakeword - -Enables building the Amazon Alexa voiceagent binding with included wakeword engine support. - -Note that this features assumes that the amazonlite wakeword engine ZIP file -(i.e. amazonlite-2.3.zip) is present in the directory pointed at by the -XDG_DOWNLOAD_DIR environment variable if it is set, and $HOME/Downloads -otherwise. The zip file will be extracted into place in the alexa-auto-sdk -repository (at external/alexa-auto-sdk/extensions/extra/amazonlite), and -patched to work with the version of Yocto used by AGL. diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/amazonlite-2.3.patch b/templates/feature/agl-voiceagent-alexa-wakeword/amazonlite-2.3.patch deleted file mode 100644 index ec9975fa..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/amazonlite-2.3.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- meta-aac-amazonlite/recipes-avs/avs-device-sdk/avs-device-sdk_%.bbappend.bak 2021-02-01 16:41:34.464564753 -0500 -+++ meta-aac-amazonlite/recipes-avs/avs-device-sdk/avs-device-sdk_%.bbappend 2021-02-01 16:41:54.392457938 -0500 -@@ -3,6 +3,8 @@ - - SRC_URI += "file://${AMAZONLITE_PACKAGES}/${WRAPPER_NAME}-${WRAPPER_VERSION}.tgz" - -+inherit python3native -+ - AMAZONLITE_CPP_MODEL_NAME ?= "D.en-US.alexa.cpp" - AMAZONLITE_CPP_MODEL_PATH = "${STAGING_DIR_HOST}${datadir}/pryon-lite/models" - -@@ -19,5 +21,5 @@ - PACKAGECONFIG += "amazonlite" - - do_configure_prepend() { -- ${WORKDIR}/${WRAPPER_NAME}/apply_adapter.py ${S} --} -\ No newline at end of file -+ ${PYTHON} ${WORKDIR}/${WRAPPER_NAME}/apply_adapter.py ${S} -+} ---- meta-aac-amazonlite/conf/layer.conf.bak 2021-02-01 17:44:07.559285446 -0500 -+++ meta-aac-amazonlite/conf/layer.conf 2021-02-01 17:44:42.847875916 -0500 -@@ -9,6 +9,8 @@ - BBFILE_PATTERN_aac-amazonlite = "^${LAYERDIR}/" - BBFILE_PRIORITY_aac-amazonlite = "6" - -+LAYERSERIES_COMPAT_aac-amazonlite = "kirkstone" -+ - AMAZONLITE ?= "ON" - AMAZONLITE_PACKAGES = "${LAYERDIR}/packages" - diff --git a/templates/feature/agl-voiceagent-alexa-wakeword/included.dep b/templates/feature/agl-voiceagent-alexa-wakeword/included.dep deleted file mode 100644 index 71688dda..00000000 --- a/templates/feature/agl-voiceagent-alexa-wakeword/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-voiceagent-alexa diff --git a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc deleted file mode 100644 index 94d877ae..00000000 --- a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc +++ /dev/null @@ -1,15 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-speech-framework \ - ${METADIR}/external/alexa-auto-sdk/builder/meta-aac \ -" - -# Per the SDK documentation, the module recipes need to be manually -# added, as they sit outside of the layer. -BBFILES += "${METADIR}/external/alexa-auto-sdk/modules/*/*.bb" - -# Include the recipe for the required gstreamer module as well -BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/system-audio/modules/*/*.bb" - -# For now, tweak the layer's compatibility to allow using with zeus, -# since we know it works without major issues. -LAYERSERIES_COMPAT_aac:append = " kirkstone" diff --git a/templates/feature/agl-voiceagent-alexa/50_local.conf.inc b/templates/feature/agl-voiceagent-alexa/50_local.conf.inc deleted file mode 100644 index 828b88d6..00000000 --- a/templates/feature/agl-voiceagent-alexa/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc -require conf/include/agl-voiceagent-alexa.inc diff --git a/templates/feature/agl-voiceagent-alexa/README_feature_agl-voiceagent-alexa.md b/templates/feature/agl-voiceagent-alexa/README_feature_agl-voiceagent-alexa.md deleted file mode 100644 index 584042fe..00000000 --- a/templates/feature/agl-voiceagent-alexa/README_feature_agl-voiceagent-alexa.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -description: Feature agl-voiceagent-alexa -authors: Scott Murray ---- - -### Feature agl-voiceagent-alexa - -Enables building Amazon Alexa voice agent binding for the speech framework using the Alexa Automotive SDK. -- cgit 1.2.3-korg