]> code.ossystems Code Review - openembedded-core.git/commitdiff
pulseaudio: Drop pulseaudio-conf
authorMarek Vasut <marex@denx.de>
Thu, 8 Jul 2021 13:33:49 +0000 (15:33 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 9 Jul 2021 09:38:37 +0000 (11:38 +0200)
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>
meta/recipes-multimedia/pulseaudio/pulseaudio.inc

index 005cb36b8e15da75a8ee0488d5f6f75beb21aa8b..2c9e8167c4f637ab1d66cf2bc5ab65018eec4ce9 100644 (file)
@@ -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}/*"