diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-08-02 17:10:51 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-20 00:33:16 +0000 |
commit | bad73bf315325c3428e331984f9d17bb8b2873b3 (patch) | |
tree | f1af509d2d534d7232ab63304faf52e549fbaeca /meta-pipewire/dynamic-layers | |
parent | 5f1d801530f9b3d7f99826b4cc8cc23df77d1e42 (diff) |
Convert to new override syntax
This is effectively a manual cherry-pick and squash of commits:
dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f
917a82316bf53ead29d6345a39189d9e4efeef25
20e81c0a9d36660de671dd5ac2e006e31c0e621b
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: I91c1640c6335d7748a2531d2fe8bf86d2d2aee32
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26876
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-pipewire/dynamic-layers')
6 files changed, 10 insertions, 10 deletions
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb index 2a8261195..f7235c177 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-apis/agl-service-audiomixer/agl-service-audiomixer_git.bb @@ -14,4 +14,4 @@ S = "${WORKDIR}/git" inherit cmake aglwgt pkgconfig DEPENDS += "pipewire wireplumber json-c" -RDEPENDS_${PN} = "agl-service-signal-composer" +RDEPENDS:${PN} = "agl-service-signal-composer" diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend index 92ebf837f..691236d41 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-core/packagegroups/packagegroup-pipewire.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ agl-service-audiomixer \ " diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend index c895efc8b..d0d7e9d29 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/pipewire:" +FILESEXTRAPATHS:prepend := "${THISDIR}/pipewire:" -SRC_URI_append= "\ +SRC_URI:append= "\ file://0001-modules-add-new-access-seclabel-module.patch \ file://pipewire.conf \ file://pipewire.service \ @@ -8,7 +8,7 @@ SRC_URI_append= "\ file://smack-pipewire \ " -do_install_append() { +do_install:append() { # replace the original config with our smack-aware config mkdir -p ${D}${sysconfdir}/pipewire/ install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf @@ -28,7 +28,7 @@ do_install_append() { fi } -FILES_${PN}_append = "\ +FILES:${PN}:append = "\ ${sysconfdir}/smack/accesses.d/* \ ${sysconfdir}/pipewire/pipewire.conf \ " diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend index e94f67eff..106de4f6a 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/wireplumber-config-agl:" +FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber-config-agl:" SRC_URI += "\ file://50-access-agl.lua \ file://access-smack.lua \ " -do_install_append() { +do_install:append() { # install smack-specific config config_dir="${D}${sysconfdir}/wireplumber/config.lua.d/" access_dir="${D}${sysconfdir}/wireplumber/scripts/access/" diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend index ccb6c4137..9dbf47afc 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/cynagora/cynagora_%.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { echo "System::Pipewire * * http://tizen.org/privilege/internal/dbus yes forever" >> ${D}${sysconfdir}/security/cynagora.initial } diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend index 47c9b9149..6ab9d07ef 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { echo "~APP~ System::Pipewire rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack } |