projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60ac7dd)
pulseaudio: daemons should conflict to each other
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Sat, 29 Oct 2022 21:41:11 +0000 (23:41 +0200)
committerRosen Penev <rosenp@gmail.com>
Tue, 1 Nov 2022 14:15:22 +0000 (07:15 -0700)
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>
sound/pulseaudio/Makefile patch | blob | history

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index eb33759b2add7cb343b9e16ce16923a3e53a42e7..d908cd1caca9ccb5dfb2e7604939f9afa407d710 100644 (file)
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -40,6 +40,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