From 2a069d5124121336a77573e95dde9c8c34b872ec Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Fri, 4 Oct 2019 22:26:00 +0300 Subject: Revert "pipewire: security-manager: add patch to grant dbus privilege to pipewire" This reverts commit 1e7b764c947d05ad985040011b01c800bcd9d99c. Pipewire no longer needs dbus access, since the bluetooth impl is gone. Bug-AGL: SPEC-2792 Change-Id: Ie451cb5e43b6230eae6fa16b5d915b44b181a679 Signed-off-by: George Kiagiadakis --- .../0002-Grant-dbus-privilege-to-pipewire.patch | 26 ---------------------- .../security-manager/security-manager_%.bbappend | 5 +---- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta-pipewire/recipes-security/security-manager/security-manager/0002-Grant-dbus-privilege-to-pipewire.patch diff --git a/meta-pipewire/recipes-security/security-manager/security-manager/0002-Grant-dbus-privilege-to-pipewire.patch b/meta-pipewire/recipes-security/security-manager/security-manager/0002-Grant-dbus-privilege-to-pipewire.patch deleted file mode 100644 index fbf9ca6f..00000000 --- a/meta-pipewire/recipes-security/security-manager/security-manager/0002-Grant-dbus-privilege-to-pipewire.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f95469247c182b3c4b527af04b1ae50658461e85 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis -Date: Tue, 3 Sep 2019 16:24:49 +0300 -Subject: [PATCH] Grant dbus privilege to pipewire - ---- - policy/security-manager-policy-reload | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/policy/security-manager-policy-reload b/policy/security-manager-policy-reload -index 274c49c..a883048 100755 ---- a/policy/security-manager-policy-reload -+++ b/policy/security-manager-policy-reload -@@ -59,6 +59,9 @@ do - cyad --set-policy --bucket=MANIFESTS --client="$client" --user="*" --privilege="*" --type=ALLOW - done - -+# PipeWire needs to get access to dbus -+cyad --set-policy --bucket=MANIFESTS --client="System::Pipewire" --user="*" --privilege="http://tizen.org/privilege/internal/dbus" --type=ALLOW -+ - # Load privilege-group mappings - ( - echo "BEGIN;" --- -2.23.0.rc1 - diff --git a/meta-pipewire/recipes-security/security-manager/security-manager_%.bbappend b/meta-pipewire/recipes-security/security-manager/security-manager_%.bbappend index 97d01822..319a27d6 100644 --- a/meta-pipewire/recipes-security/security-manager/security-manager_%.bbappend +++ b/meta-pipewire/recipes-security/security-manager/security-manager_%.bbappend @@ -1,5 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:" -SRC_URI += "\ - file://0001-Adapt-smack-rules-to-allow-connections-to-pipewire.patch \ - file://0002-Grant-dbus-privilege-to-pipewire.patch \ - " +SRC_URI += "file://0001-Adapt-smack-rules-to-allow-connections-to-pipewire.patch" -- cgit 1.2.3-korg