From d35902dda481c88829cfc66d12734527595de7e9 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 8 Jul 2021 15:33:49 +0200 Subject: pulseaudio: Drop pulseaudio-conf The pulseaudio.inc currently contains these two assignments: FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-server = "... ${sysconfdir} ..." This results in pulseaudio-server shipping the configuration in /etc/pulse/ , and based on CONFFILES_${PN}-server and co., this is how it was intended to work. However, that also means FILES_${PN}-conf is not useful. In fact, FILES_${PN}-conf is likely meant for MACHINE specific configuration, which would better be packaged in separate recipe like e.g. systemd does in systemd-conf_%.bb . Better yet, such pulseaudio-conf_%.bb could ship MACHINE specific configuration overrides, which according to pulse-daemon.conf(5) are picked from /etc/pulse/daemon.conf.d , while pulseaudio-server would ship the default configuration files. Remove FILES_${PN}-conf . (From OE-Core rev: a83aac8b7717aac48dbb8f6803a015c0098e6d31) Signed-off-by: Marek Vasut Cc: Tanu Kaskinen Cc: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 005cb36b8e..2c9e8167c4 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -183,7 +183,6 @@ FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" -FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" FILES_${PN}-pa-info = "${bindir}/pa-info" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" -- cgit v1.2.3-54-g00ecf