On Tue, Jan 10, 2023 at 04:05:16PM +0100, Michael Tretter wrote: > The entire src/daemon subdirectory is disabled. This disables the build > of the pulseaudio executable and the generation of the daemon.conf, > system.pa, and default.pa configuration files. > > In src/utils, the pacmd and pasuspender are explicitly disabled. > pasuspender was never installed by the ptxdist rule. > > The src/pulsecore subdirectory is disabled. Therefore, libpulsecore is > not built. > > The src/modules subdirectory is disabled. Therefore, no modules are > built. As this disables the alsa-mixer module, there are no > configuration files for the alsa-mixer and, thus, the > usr/share/pulseaudio directory is empty and not created. > > Signed-off-by: Michael Tretter <[email protected]> > --- > rules/pulseaudio.make | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make > index 4c1763028cdd..63c4d8e9af86 100644 > --- a/rules/pulseaudio.make > +++ b/rules/pulseaudio.make > @@ -122,9 +122,11 @@ $(STATEDIR)/pulseaudio.targetinstall: > @$(call install_fixup, pulseaudio,DESCRIPTION,missing) > > @$(call install_alternative, pulseaudio, 0, 0, 0644, > /etc/pulse/client.conf) > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_alternative, pulseaudio, 0, 0, 0644, > /etc/pulse/daemon.conf) > @$(call install_alternative, pulseaudio, 0, 0, 0644, > /etc/pulse/system.pa) > @$(call install_alternative, pulseaudio, 0, 0, 0644, > /etc/pulse/default.pa) > +endif > > ifdef PTXCONF_PULSEAUDIO_BLUETOOTH > @$(call install_alternative, pulseaudio, 0, 0, 0644, \ > @@ -148,9 +150,13 @@ ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT_USER > /usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket) > endif > > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pulseaudio) > +endif > @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl) > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacmd) > +endif > @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacat) > @$(call install_link, pulseaudio, pacat, /usr/bin/pamon) > @$(call install_link, pulseaudio, pacat, /usr/bin/paplay) > @@ -159,11 +165,17 @@ endif > > @$(call install_lib, pulseaudio, 0, 0, 0644, libpulse) > @$(call install_lib, pulseaudio, 0, 0, 0644, libpulse-simple) > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_lib, pulseaudio, 0, 0, 0644, > pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION)) > +endif > @$(call install_lib, pulseaudio, 0, 0, 0644, > pulseaudio/libpulsecommon-$(PULSEAUDIO_VERSION)) > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_tree, pulseaudio, 0, 0, -, > /usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules) > +endif > > +ifdef PTXCONF_PULSEAUDIO_DAEMON > @$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio) > +endif
I think it would be better to reorder the targetinstall stage so that there is only one "ifdef PTXCONF_PULSEAUDIO_DAEMON" Michael > > @$(call install_finish, pulseaudio) > > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
