projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6a4b1d1)
pulseaudio: daemons should conflict to each other
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Sat, 29 Oct 2022 21:41:11 +0000 (23:41 +0200)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Sat, 5 Nov 2022 20:20:32 +0000 (21:20 +0100)
It should not be possible to install pulseaudio-daemon and
pulseadio-daemon-avahi at the same time as they have the same files.
Let's avoid that situation by adding conflict.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 5a5bb15949f7cf0abb717245bc23508af2c48ed9)

sound/pulseaudio/Makefile patch | blob | history

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 0e1ff1d63ef8cf8017e7949c1008472c294c4028..565fb3fdb7138b524a0ae6e6a61e55fcfb9c1c8f 100644 (file)
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -41,6 +41,7 @@ endef
 define Package/pulseaudio-daemon
   $(call Package/pulseaudio-daemon/Default)
   VARIANT:=noavahi
+  CONFLICTS:=pulseaudio-daemon-avahi
 endef
 
 define Package/pulseaudio-daemon-avahi
Mirror of packages feed