diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-08-09 11:33:17 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-08-09 15:43:04 +0200 |
commit | 13169c3265ba75d783eb3723504298a08e768110 (patch) | |
tree | 9f30b921d3491ad9bc8a55d58fd3bf6f3db8800e /meta-agl-lxc/recipes-multimedia/wireplumber | |
parent | ce87122d195d3a1fea454cfa4acd91e22ccea264 (diff) |
Rename Instrument Cluster Container layer
meta-agl-lxc is no longer reflecting the actual content and use of the layer.
Rename it to 'meta-agl-ic-container' and the feature to 'agl-ic-container'.
Also rename the main image to 'agl-cluster-demo-lxc-host' to match the pattern used
by all other images e.g. agl-<ivi,cluster,telematics>-demo-* .
But keep the names of the underlying images as-is.
Bug-AGL: SPEC-4464
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b
Diffstat (limited to 'meta-agl-lxc/recipes-multimedia/wireplumber')
3 files changed, 0 insertions, 77 deletions
diff --git a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bbappend b/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bbappend deleted file mode 100644 index fe6dab86..00000000 --- a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -do_install:append() { - config_dir="${D}${sysconfdir}/wireplumber/" - systemd_dir="${D}${sysconfdir}/systemd/system/sockets.target.wants" - - # enable additional systemd services - install -d ${systemd_dir} - ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@policy.service -} diff --git a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch b/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch deleted file mode 100644 index 0da0bfb6..00000000 --- a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a2d324c75057f0ddd66cbe5b5e419fddda213cc2 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 - -- remove the pipewire daemon dependencies so that -only wireplumber policy daemon can run in containers. -- remove pipewire user ---- - 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 ---- 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. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -19,9 +18,8 @@ SystemCallFilter=@system-service - Type=simple - ExecStart=@WP_BINARY@ -c %i.conf - Restart=on-failure --User=pipewire --Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire -+Environment=PIPEWIRE_RUNTIME_DIR=/var - Environment=GIO_USE_VFS=local - - [Install] --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 ---- 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. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -23,4 +22,4 @@ Slice=session.slice - Environment=GIO_USE_VFS=local - - [Install] --WantedBy=pipewire.service -+WantedBy=multi-user.target --- -2.35.1 - diff --git a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber_git.bbappend b/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber_git.bbappend deleted file mode 100644 index 56f03a4c..00000000 --- a/meta-agl-lxc/recipes-multimedia/wireplumber/wireplumber_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber:" - -SRC_URI += "\ - file://0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch \ -" |