aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2024-09-06 09:13:17 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-09-06 14:14:15 +0000
commit1ce02a8164d1a81c880c9accb431094a38060d78 (patch)
treea32fb44fcf0f40ba4628581534231a80cb71f308
parenta504ffdfbf965715018ad7419fa7aba7b7329c2e (diff)
meta-agl-ic-container: wireplumber: refresh patch to apply on 0.5.6ricefish_18.0.2ricefish_18.0.1ricefish/18.0.2ricefish/18.0.118.0.218.0.1ricefish
Bug-AGL: SPEC-4934 Change-Id: I4832fd69b145a7c630735fee2e87a4750cedccde Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com> (cherry picked from commit a27501956c3adcb44c8a1ec31971cd9316f5d122)
-rw-r--r--meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch
index 42991e67..ba400211 100644
--- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch
+++ b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch
@@ -1,4 +1,4 @@
-From 7c389b72b5a009ca56f90bbc531074b55bdcb5a9 Mon Sep 17 00:00:00 2001
+From 512e9ee130841e3b6c379511234afc07d66d99d7 Mon Sep 17 00:00:00 2001
From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
Date: Mon, 28 Feb 2022 06:46:19 +0530
Subject: [PATCH] systemd: changes to run wireplumber instances in containers
@@ -14,11 +14,11 @@ Upstream-Status: Inappropriate [configuration]
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in
-index 29e65598..686a93d3 100644
+index 0766d4e0..50ddf4c6 100644
--- a/src/systemd/system/wireplumber@.service.in
+++ b/src/systemd/system/wireplumber@.service.in
@@ -5,8 +5,7 @@
- # wireplumber@policy.service loads policy.conf, etc.
+ # wireplumber@policy.service loads the "policy" profile, etc.
[Unit]
Description=Multimedia Service Session Manager (%i)
-After=pipewire.service
@@ -29,7 +29,7 @@ index 29e65598..686a93d3 100644
[Service]
@@ -19,9 +18,8 @@ Type=simple
AmbientCapabilities=CAP_SYS_NICE
- ExecStart=@WP_BINARY@ -c %i.conf
+ ExecStart=@WP_BINARY@ -p %i
Restart=on-failure
-User=pipewire
-Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
@@ -40,11 +40,11 @@ index 29e65598..686a93d3 100644
-WantedBy=pipewire.service
+WantedBy=multi-user.target
diff --git a/src/systemd/user/wireplumber@.service.in b/src/systemd/user/wireplumber@.service.in
-index a0b10f7b..8fbd6bd7 100644
+index 5c1096fc..7368f683 100644
--- a/src/systemd/user/wireplumber@.service.in
+++ b/src/systemd/user/wireplumber@.service.in
@@ -5,8 +5,7 @@
- # wireplumber@policy.service loads policy.conf, etc.
+ # wireplumber@policy.service loads the "policy" profile, etc.
[Unit]
Description=Multimedia Service Session Manager (%i)
-After=pipewire.service