From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] pulseaudio: fix targetinstall without daemon
Date: Wed, 8 Feb 2023 12:49:27 +0100 [thread overview]
Message-ID: <20230208114927.2007852-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230111094944.3388707-1-m.tretter@pengutronix.de>
Thanks, applied as ca6725cef0ab8bebcf6612aabf5388b95115d530.
Michael
[sent from post-receive hook]
On Wed, 08 Feb 2023 12:49:27 +0100, Michael Tretter <m.tretter@pengutronix.de> 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. 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.tretter@pengutronix.de>
> Message-Id: <20230111094944.3388707-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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.olbrich@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)
>
prev parent reply other threads:[~2023-02-08 11:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 9:49 [ptxdist] [PATCH v2] " Michael Tretter
2023-02-08 11:49 ` Michael Olbrich [this message]
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=20230208114927.2007852-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.tretter@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