diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-04-12 08:42:46 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-04-12 08:42:46 +0200 |
| commit | f1f82be0c6181254902964bd6ff54883b9dc9093 (patch) | |
| tree | 7471671f31a73ada94aeb3e46d3115511f7d985d | |
| parent | c626833a6a0047ff28cd42b40aaafbc245a312da (diff) | |
| download | ptxdist-f1f82be0c6181254902964bd6ff54883b9dc9093.tar.gz ptxdist-f1f82be0c6181254902964bd6ff54883b9dc9093.tar.xz | |
pulseaudio: make systemd units optional
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/pulseaudio.in | 11 | ||||
| -rw-r--r-- | rules/pulseaudio.make | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in index 3c925f70f..478b4355f 100644 --- a/rules/pulseaudio.in +++ b/rules/pulseaudio.in @@ -37,10 +37,17 @@ config PULSEAUDIO_SYSTEMD bool default INITMETHOD_SYSTEMD -config PULSEAUDIO_SYSTEMD_USER +config PULSEAUDIO_SYSTEMD_UNIT bool + default !SYSTEMD_UNITS_USER depends on PULSEAUDIO_SYSTEMD - default y if SYSTEMD_UNITS_USER + prompt "install systemd system unit file" + +config PULSEAUDIO_SYSTEMD_UNIT_USER + bool + default y + depends on PULSEAUDIO_SYSTEMD && SYSTEMD_UNITS_USER + prompt "install systemd user unit file" config PULSEAUDIO_BLUETOOTH bool diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make index 0dc6999a3..a2875a366 100644 --- a/rules/pulseaudio.make +++ b/rules/pulseaudio.make @@ -121,15 +121,15 @@ ifdef PTXCONF_PULSEAUDIO_BLUETOOTH /etc/dbus-1/system.d/pulseaudio-system.conf) endif -ifdef PTXCONF_PULSEAUDIO_SYSTEMD -ifndef PTXCONF_PULSEAUDIO_SYSTEMD_USER +ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT @$(call install_alternative, pulseaudio, 0, 0, 0644, \ /usr/lib/systemd/system/pulseaudio.service) @$(call install_alternative, pulseaudio, 0, 0, 0644, \ /usr/lib/systemd/system/pulseaudio.socket) @$(call install_link, pulseaudio, ../pulseaudio.socket, \ /usr/lib/systemd/system/sockets.target.wants/pulseaudio.socket) -else +endif +ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT_USER @$(call install_alternative, pulseaudio, 0, 0, 0644, \ /usr/lib/systemd/user/pulseaudio.service) @$(call install_alternative, pulseaudio, 0, 0, 0644, \ @@ -137,7 +137,6 @@ else @$(call install_link, pulseaudio, ../pulseaudio.socket, \ /usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket) endif -endif @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pulseaudio) @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl) |