aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2021-07-08 15:33:49 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2021-07-09 11:38:37 +0200
commita83aac8b7717aac48dbb8f6803a015c0098e6d31 (patch)
treef270ecd2e17a583ee908c2290e8854b5a823aeba
parent7ff692d2e9787bb5b36929a208597595473db0c7 (diff)
downloadopenembedded-core-contrib-a83aac8b7717aac48dbb8f6803a015c0098e6d31.tar.gz
openembedded-core-contrib-a83aac8b7717aac48dbb8f6803a015c0098e6d31.tar.bz2
openembedded-core-contrib-a83aac8b7717aac48dbb8f6803a015c0098e6d31.zip
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 . Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tanu Kaskinen <tanuk@iki.fi> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 005cb36b8e1..2c9e8167c4f 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}/*"