X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-pipewire%2Frecipes-multimedia%2Fwireplumber%2Fwireplumber-config-agl_git.bb;h=22ffe5bf38cc2025ee1af1860eba26cdc51b25c4;hb=57df0aefa1b7c80eb3f65cb2f5151937869cd102;hp=2f890d6c97d8ce83df11620a1f5e3e3d3951fdab;hpb=761e6467d12e2935785774383adca9ddbd3e1c26;p=AGL%2Fmeta-agl.git

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
index 2f890d6c9..22ffe5bf3 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
@@ -6,38 +6,56 @@ SECTION     = "multimedia"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = "\
+    file://bluetooth.lua.d/ \
+    file://host.lua.d/ \
     file://00-functions.lua \
-    file://00-spa-libs.lua \
-    file://10-default-policy.lua \
-    file://30-alsa-monitor.lua \
-    file://30-bluez-monitor.lua \
-    file://99-load-modules.lua \
+    file://alsa-suspend.lua \
+    file://bluetooth.conf \
+    file://wireplumber.conf \
     file://wireplumber-bluetooth.conf \
 "
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
-do_install_append() {
-    config_dir="${D}${sysconfdir}/wireplumber/config.lua.d/"
+do_install:append() {
+    config_dir="${D}${sysconfdir}/wireplumber/"
+    scripts_dir="${D}${datadir}/wireplumber/scripts/"
     dbus_config_dir="${D}${sysconfdir}/dbus-1/system.d/"
+    systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants/"
 
     install -d ${config_dir}
     install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir}
-    install -m 0644 ${WORKDIR}/00-spa-libs.lua ${config_dir}
-    install -m 0644 ${WORKDIR}/10-default-policy.lua ${config_dir}
-    install -m 0644 ${WORKDIR}/30-alsa-monitor.lua ${config_dir}
-    install -m 0644 ${WORKDIR}/30-bluez-monitor.lua ${config_dir}
-    install -m 0644 ${WORKDIR}/99-load-modules.lua ${config_dir}
 
+    # config of the main (host) instance
+    install -d ${config_dir}/host.lua.d/
+    ln -s ../00-functions.lua ${config_dir}/host.lua.d/00-functions.lua
+    install -m 0644 ${WORKDIR}/host.lua.d/*.lua ${config_dir}/host.lua.d/
+    install -m 0644 ${WORKDIR}/wireplumber.conf ${config_dir}
+
+    # config of the bluetooth instance
+    install -d ${config_dir}/bluetooth.lua.d/
+    ln -s ../00-functions.lua ${config_dir}/bluetooth.lua.d/00-functions.lua
+    install -m 0644 ${WORKDIR}/bluetooth.lua.d/*.lua ${config_dir}/bluetooth.lua.d/
+    install -m 0644 ${WORKDIR}/bluetooth.conf ${config_dir}
+
+    # install the alsa-suspend script, loaded by the main instance
+    install -d ${scripts_dir}
+    install -m 0644 ${WORKDIR}/alsa-suspend.lua ${scripts_dir}
+
+    # install dbus daemon configuration
     install -d ${dbus_config_dir}
     install -m 0644 ${WORKDIR}/wireplumber-bluetooth.conf ${dbus_config_dir}
+
+    # enable additional systemd services
+    install -d ${systemd_dir}
+    ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@bluetooth.service
 }
 
-FILES_${PN} += "\
-    ${sysconfdir}/wireplumber/* \
+FILES:${PN} += "\
+    ${sysconfdir}/* \
+    ${datadir}/wireplumber/* \
 "
-CONFFILES_${PN} += "\
-    ${sysconfdir}/wireplumber/* \
+CONFFILES:${PN} += "\
+    ${sysconfdir}/* \
 "
-RPROVIDES_${PN} += "virtual/wireplumber-config"