diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:57:33 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-11-17 14:19:36 -0500 |
| commit | a8dbd14daaac8b5c52326262dbc43975836cc0df (patch) | |
| tree | e52e3eaaa084ddf2d3fb44158cd0f2d5c9140178 /meta-speech-framework/meta-aac/recipes-modules | |
| parent | f9dcc4101b86d14f583319786286a72b63cbbc98 (diff) | |
Convert to new override syntax
This is effectively a manual cherry-pick of commit:
37d3b1b316470fdcfebc59d5522bfbfefc025ff6
from the master branch with additional review and fixups.
The intent of these changes is to minimize the effort to backport
fixes from the master branch, which has been updated in preparation
for the switch to the next Yocto LTS release in early 2022.
Bug-AGL: SPEC-4144
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7
Diffstat (limited to 'meta-speech-framework/meta-aac/recipes-modules')
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend index 93b7b443..a4a0c57b 100644 --- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend +++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend @@ -1,3 +1,3 @@ # Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe -DEPENDS_remove = "nlohmann" -DEPENDS_append = " nlohmann-json" +DEPENDS:remove = "nlohmann" +DEPENDS:append = " nlohmann-json" diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend index 93b7b443..a4a0c57b 100644 --- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend +++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend @@ -1,3 +1,3 @@ # Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe -DEPENDS_remove = "nlohmann" -DEPENDS_append = " nlohmann-json" +DEPENDS:remove = "nlohmann" +DEPENDS:append = " nlohmann-json" diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend index 94e9f94b..7417b494 100644 --- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend +++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # Needed for the required gstreamer-app-1.0 pkgconfig bits DEPENDS += "gstreamer1.0-plugins-base" @@ -9,4 +9,4 @@ AAC_PATCHES += "file://0001-update-pipewire-gstreamer-plugins.patch" EXTRA_OECMAKE += "-DUSE_PIPEWIRE=1" # Pull static library into appropriate package to avoid a QA error -FILES_${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a" +FILES:${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a" |