diff options
author | Marek Vasut <marex@denx.de> | 2021-07-08 15:33:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-09 23:44:53 +0100 |
commit | d35902dda481c88829cfc66d12734527595de7e9 (patch) | |
tree | 66adad3c459837f356e84cc99b13ef43ecdc3080 | |
parent | fc4ddb28fd67e12c51a6ce81e45373e22180acc0 (diff) | |
download | poky-d35902dda481c88829cfc66d12734527595de7e9.tar.gz |
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 <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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 |
1 files changed, 0 insertions, 1 deletions
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.*" | |||
183 | FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" | 183 | FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" |
184 | 184 | ||
185 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" | 185 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" |
186 | FILES_${PN}-conf = "${sysconfdir}" | ||
187 | FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" | 186 | FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" |
188 | FILES_${PN}-pa-info = "${bindir}/pa-info" | 187 | FILES_${PN}-pa-info = "${bindir}/pa-info" |
189 | FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" | 188 | FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" |