From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 10 Jan 2023 16:05:58 +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 1pFGCN-007rGt-0L for lore@lore.pengutronix.de; Tue, 10 Jan 2023 16:05:58 +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 1pFGCL-0001cB-3a; Tue, 10 Jan 2023 16:05:57 +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 1pFGBi-0001bh-6e; Tue, 10 Jan 2023 16:05:18 +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 1pFGBh-0056g2-IN; Tue, 10 Jan 2023 16:05:17 +0100 Received: from mtr by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pFGBg-007h47-Sl; Tue, 10 Jan 2023 16:05:16 +0100 From: Michael Tretter To: ptxdist@pengutronix.de Date: Tue, 10 Jan 2023 16:05:16 +0100 Message-Id: <20230110150516.1833794-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] 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: mtr@pengutronix.de 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 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 --- 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