summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container/recipes-multimedia/wireplumber
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-05-01 15:04:53 -0400
committerScott Murray <scott.murray@konsulko.com>2024-05-01 15:04:53 -0400
commitb7b86b40da97986e310cfcbbb58aaddb3f972f09 (patch)
tree0f84427e8db8ec32c70831ec01a30d3a6d6a6f4c /meta-agl-ic-container/recipes-multimedia/wireplumber
parent4de37d6af4cc5d98007f7904a783a61d19c14ea3 (diff)
meta-agl-ic-container: updates for scarthgap upgrade
Initial set of fixes to handle upgrade to YP 5.0 / scarthgap. The images are still not buildable after these changes due to the DRM lease changes to Weston needing further work. Changes: - Rename gstreamer1.0-plugins-bad bbappend for version bump. - Update rcar-gen3 kernel module bbappends to be compatible with upstream recipe changes. - Update lxc bbappend to handle addition of lxc-monitord in new version. - Refreshed wireplumber patch to fix QA errors. - Dropped dlt-daemon logging patch for now, IC EG will need to investigate whether it is still required. Bug-AGL: SPEC-5123 Change-Id: I3c49bee8c53ef5127950643d3f455167e4da30d9 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-agl-ic-container/recipes-multimedia/wireplumber')
-rw-r--r--meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch19
1 files changed, 8 insertions, 11 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 0da0bfb6..42991e67 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 a2d324c75057f0ddd66cbe5b5e419fddda213cc2 Mon Sep 17 00:00:00 2001
+From 7c389b72b5a009ca56f90bbc531074b55bdcb5a9 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
@@ -6,15 +6,15 @@ Subject: [PATCH] systemd: changes to run wireplumber instances in containers
- remove the pipewire daemon dependencies so that
only wireplumber policy daemon can run in containers.
- remove pipewire user
+
+Upstream-Status: Inappropriate [configuration]
---
src/systemd/system/wireplumber@.service.in | 8 +++-----
src/systemd/user/wireplumber@.service.in | 5 ++---
2 files changed, 5 insertions(+), 8 deletions(-)
- Inappropriate [configuration]
-
diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in
-index ba8eefe..e4b985b 100644
+index 29e65598..686a93d3 100644
--- a/src/systemd/system/wireplumber@.service.in
+++ b/src/systemd/system/wireplumber@.service.in
@@ -5,8 +5,7 @@
@@ -27,8 +27,8 @@ index ba8eefe..e4b985b 100644
Conflicts=pipewire-media-session.service
[Service]
-@@ -19,9 +18,8 @@ SystemCallFilter=@system-service
- Type=simple
+@@ -19,9 +18,8 @@ Type=simple
+ AmbientCapabilities=CAP_SYS_NICE
ExecStart=@WP_BINARY@ -c %i.conf
Restart=on-failure
-User=pipewire
@@ -40,7 +40,7 @@ index ba8eefe..e4b985b 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 9dbceff..7e21194 100644
+index a0b10f7b..8fbd6bd7 100644
--- a/src/systemd/user/wireplumber@.service.in
+++ b/src/systemd/user/wireplumber@.service.in
@@ -5,8 +5,7 @@
@@ -53,12 +53,9 @@ index 9dbceff..7e21194 100644
Conflicts=pipewire-media-session.service
[Service]
-@@ -23,4 +22,4 @@ Slice=session.slice
+@@ -22,4 +21,4 @@ Slice=session.slice
Environment=GIO_USE_VFS=local
[Install]
-WantedBy=pipewire.service
+WantedBy=multi-user.target
---
-2.35.1
-