From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 08 Feb 2023 12:49:50 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pPixU-000Vr1-E2 for lore@lore.pengutronix.de; Wed, 08 Feb 2023 12:49:50 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pPixR-0008PG-Cp; Wed, 08 Feb 2023 12:49:49 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pPix7-00087Q-5y; Wed, 08 Feb 2023 12:49:29 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pPix5-003VLk-BC; Wed, 08 Feb 2023 12:49:28 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pPix5-008QLT-Jg; Wed, 08 Feb 2023 12:49:27 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 8 Feb 2023 12:49:27 +0100 Message-Id: <20230208114927.2007852-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230111094944.3388707-1-m.tretter@pengutronix.de> References: <20230111094944.3388707-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] pulseaudio: fix targetinstall without daemon X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as ca6725cef0ab8bebcf6612aabf5388b95115d530. Michael [sent from post-receive hook] On Wed, 08 Feb 2023 12:49:27 +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. 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 > Message-Id: <20230111094944.3388707-1-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 ") > @$(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) >