From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 Aug 2018 11:20:06 +0000 (+0100)
Subject: avahi: Build without dbus
X-Git-Tag: v2.21-core123~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5221a852e80526d188306b05202e595616f0c065;p=people%2Fstevee%2Fipfire-2.x.git

avahi: Build without dbus

We don't have any services connected to dbus, so what is the
point of avahi trying to connect to it?

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index a394cc20a6..bf8a387c38 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,7 +7,6 @@ etc/avahi/services
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
-etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse
 usr/bin/avahi-browse-domains
@@ -90,16 +89,6 @@ usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
 usr/share/avahi
 usr/share/avahi/avahi-service.dtd
-#usr/share/dbus-1/interfaces
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 #usr/share/locale/ach
 #usr/share/locale/ach/LC_MESSAGES
 #usr/share/locale/ach/LC_MESSAGES/avahi.mo
diff --git a/lfs/avahi b/lfs/avahi
index d33d7b5e30..682ac96a5e 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
 PAK_VER    = 4
 
-DEPS	   = "dbus libdaemon"
+DEPS	   = "libdaemon"
 
 CFLAGS    += -U_FORTIFY_SOURCE
 
@@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-gtk \
 		--disable-gtk3 \
 		--disable-pygtk \
+		--disable-dbus \
 		--disable-python \
 		--disable-pygobject \
 		--disable-python-dbus \