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. As the daemon is not build, the D-BUS bus configuration and the systemd.service won't be generated, too.
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 <m.tret...@pengutronix.de> --- Changelog: v1 -> v2: - reorder targetinstall to have a single PXTCONF_PULSEAUDIO_DAEMON check - disable installation of pulseaudio-system.conf and systemd.service --- rules/pulseaudio.make | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make index 4c1763028cdd..d7a294967c48 100644 --- a/rules/pulseaudio.make +++ b/rules/pulseaudio.make @@ -121,7 +121,7 @@ $(STATEDIR)/pulseaudio.targetinstall: @$(call install_fixup, pulseaudio,AUTHOR,"Michael Olbrich <m.olbr...@pengutronix.de>") @$(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) @@ -147,10 +147,18 @@ ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT_USER @$(call install_link, pulseaudio, ../pulseaudio.socket, \ /usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket) endif - @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pulseaudio) - @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl) @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacmd) + + @$(call install_lib, pulseaudio, 0, 0, 0644, pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION)) + + @$(call install_tree, pulseaudio, 0, 0, -, /usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules) + @$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio) +endif + + @$(call install_alternative, pulseaudio, 0, 0, 0644, /etc/pulse/client.conf) + + @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl) @$(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 +167,7 @@ endif @$(call install_lib, pulseaudio, 0, 0, 0644, libpulse) @$(call install_lib, pulseaudio, 0, 0, 0644, libpulse-simple) - @$(call install_lib, pulseaudio, 0, 0, 0644, pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION)) @$(call install_lib, pulseaudio, 0, 0, 0644, pulseaudio/libpulsecommon-$(PULSEAUDIO_VERSION)) - @$(call install_tree, pulseaudio, 0, 0, -, /usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules) - - @$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio) @$(call install_finish, pulseaudio) -- 2.30.2