From 4f04fd3fd733e1109c27d48a74ed34819777596e Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 16 Feb 2024 17:16:41 -0500 Subject: meta-offline-voice-agent: remove 'virtual/' RPROVIDES Replace 'virtual/vosk-model' RPROVIDES use with just 'vosk-model' to future-proof for Yocto Project 5.0 / Scarthgap, where it triggers a warning. Also update checksums in a couple of the model recipes to fix errors seen during test builds. Bug-AGL: SPEC-5067 Change-Id: I6d39342059c93d7bef77e9b65ff11a9b2aee51aa Signed-off-by: Scott Murray --- .../python3-vosk-websocket-server_git.bb | 2 +- .../recipes-python/python3-vosk/python3-vosk-api_0.3.42.bb | 2 +- .../recipes-python/vosk-grpc-custom-server/vosk-grpc-server_git.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-en-us_0.22.bb | 6 +++--- .../recipes-vosk/vosk-model/vosk-model-small-de_0.15.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-small-en-in_0.4.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-small-en-us_0.15.bb | 4 ++-- .../recipes-vosk/vosk-model/vosk-model-small-es_0.22.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-small-fr_0.22.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-small-it_0.22.bb | 2 +- .../recipes-vosk/vosk-model/vosk-model-small-ja_0.22.bb | 2 +- .../recipes-vosk/vosk-server/vosk-server_git.bb | 2 +- templates/feature/agl-offline-voice-agent/50_local.conf.inc | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-offline-voice-agent/recipes-python/python3-vosk-websocket-server/python3-vosk-websocket-server_git.bb b/meta-offline-voice-agent/recipes-python/python3-vosk-websocket-server/python3-vosk-websocket-server_git.bb index 1cdf89c5..4aee5979 100644 --- a/meta-offline-voice-agent/recipes-python/python3-vosk-websocket-server/python3-vosk-websocket-server_git.bb +++ b/meta-offline-voice-agent/recipes-python/python3-vosk-websocket-server/python3-vosk-websocket-server_git.bb @@ -24,5 +24,5 @@ RDEPENDS:${PN} += " \ vosk \ python3-vosk-api \ python3-websockets \ - virtual/vosk-model \ + vosk-model \ " \ No newline at end of file diff --git a/meta-offline-voice-agent/recipes-python/python3-vosk/python3-vosk-api_0.3.42.bb b/meta-offline-voice-agent/recipes-python/python3-vosk/python3-vosk-api_0.3.42.bb index ba15bd56..b975da7c 100644 --- a/meta-offline-voice-agent/recipes-python/python3-vosk/python3-vosk-api_0.3.42.bb +++ b/meta-offline-voice-agent/recipes-python/python3-vosk/python3-vosk-api_0.3.42.bb @@ -38,7 +38,7 @@ RDEPENDS:${PN} += " \ python3-srt \ python3-charset-normalizer \ python3-sounddevice \ - virtual/vosk-model \ + vosk-model \ " do_install_ptest () { diff --git a/meta-offline-voice-agent/recipes-python/vosk-grpc-custom-server/vosk-grpc-server_git.bb b/meta-offline-voice-agent/recipes-python/vosk-grpc-custom-server/vosk-grpc-server_git.bb index 0a32a0cc..0973f1a5 100644 --- a/meta-offline-voice-agent/recipes-python/vosk-grpc-custom-server/vosk-grpc-server_git.bb +++ b/meta-offline-voice-agent/recipes-python/vosk-grpc-custom-server/vosk-grpc-server_git.bb @@ -16,7 +16,7 @@ RDEPENDS:${PN} += " \ python3-vosk-api \ python3-grpcio \ python3-protobuf \ - virtual/vosk-model \ + vosk-model \ python3-pycairo \ python3-pygobject \ " diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-en-us_0.22.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-en-us_0.22.bb index 16f6ab3d..c3c4e3ab 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-en-us_0.22.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-en-us_0.22.bb @@ -9,8 +9,8 @@ SRC_URI = " \ " # License listed on https://alphacephei.com/vosk/models -SRC_URI[model.sha256sum] = "30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498" -SRC_URI[license.sha256sum] = "1ff7bf86a1243a98be7964040a7c569ade4e70f8b5e815b1edb5f3a74ca5f567" +SRC_URI[model.sha256sum] = "47f9a81ebb039dbb0bd319175c36ac393c0893b796c2b6303e64cf58c27b69f6" +SRC_URI[license.sha256sum] = "46220c6d381bf1c230699077e3a693b2474f4cc768a167f25ced5034ab96890b" do_install() { install -d ${D}/usr/share/vosk @@ -19,4 +19,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-en-us-0.22 " -RPROVIDES:${PN} += "virtual/vosk-model" +RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-de_0.15.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-de_0.15.bb index c65d05bc..907997ef 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-de_0.15.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-de_0.15.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-de-0.15 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-in_0.4.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-in_0.4.bb index 5a886e0a..fa0aa3c3 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-in_0.4.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-in_0.4.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-en-in-0.4 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-us_0.15.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-us_0.15.bb index f959e566..929ad0d4 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-us_0.15.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-en-us_0.15.bb @@ -11,7 +11,7 @@ SRC_URI = " \ # License listed on https://alphacephei.com/vosk/models SRC_URI[model.sha256sum] = "30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498" -SRC_URI[license.sha256sum] = "1ff7bf86a1243a98be7964040a7c569ade4e70f8b5e815b1edb5f3a74ca5f567" +SRC_URI[license.sha256sum] = "46220c6d381bf1c230699077e3a693b2474f4cc768a167f25ced5034ab96890b" do_install() { install -d ${D}/usr/share/vosk @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-en-us-0.15 " -RPROVIDES:${PN} += "virtual/vosk-model" +RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-es_0.22.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-es_0.22.bb index 9798d9ab..5abdb457 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-es_0.22.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-es_0.22.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-es-0.22 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-fr_0.22.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-fr_0.22.bb index 0157a225..49091704 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-fr_0.22.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-fr_0.22.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-fr-0.22 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-it_0.22.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-it_0.22.bb index e7d1c43e..ac059b91 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-it_0.22.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-it_0.22.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-it-0.22 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-ja_0.22.bb b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-ja_0.22.bb index dc2292dd..887f5b17 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-ja_0.22.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-model/vosk-model-small-ja_0.22.bb @@ -20,4 +20,4 @@ do_install() { FILES:${PN} += " /usr/share/vosk /usr/share/vosk/vosk-model-small-ja-0.22 " -# RPROVIDES:${PN} += "virtual/vosk-model" +# RPROVIDES:${PN} += "vosk-model" diff --git a/meta-offline-voice-agent/recipes-vosk/vosk-server/vosk-server_git.bb b/meta-offline-voice-agent/recipes-vosk/vosk-server/vosk-server_git.bb index b0efcae0..953af8cb 100644 --- a/meta-offline-voice-agent/recipes-vosk/vosk-server/vosk-server_git.bb +++ b/meta-offline-voice-agent/recipes-vosk/vosk-server/vosk-server_git.bb @@ -29,4 +29,4 @@ do_install () { cp websocket-cpp/vosk-websocket-cpp ${D}${bindir} } -RDEPENDS:${PN} += "virtual/vosk-model" +RDEPENDS:${PN} += "vosk-model" diff --git a/templates/feature/agl-offline-voice-agent/50_local.conf.inc b/templates/feature/agl-offline-voice-agent/50_local.conf.inc index 95bc4365..f8ca1d82 100644 --- a/templates/feature/agl-offline-voice-agent/50_local.conf.inc +++ b/templates/feature/agl-offline-voice-agent/50_local.conf.inc @@ -23,7 +23,7 @@ IMAGE_INSTALL:append = " \ agl-service-voiceagent \ " -PREFERRED_PROVIDER_virtual/vosk-model ?= "vosk-model-small-en-us" +PREFERRED_RPROVIDER_vosk-model ?= "vosk-model-small-en-us" # bump bazel limits -- cgit 1.2.3-korg