From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: mtr@pengutronix.de
Subject: [ptxdist] [PATCH] pulseaudio: fix targetinstall without daemon
Date: Tue, 10 Jan 2023 16:05:16 +0100 [thread overview]
Message-ID: <20230110150516.1833794-1-m.tretter@pengutronix.de> (raw)
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 <m.tretter@pengutronix.de>
---
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
@$(call install_finish, pulseaudio)
--
2.30.2
next reply other threads:[~2023-01-10 15:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 15:05 Michael Tretter [this message]
2023-01-10 16:09 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230110150516.1833794-1-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=mtr@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox