summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-03-01 14:13:56 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2011-03-01 14:13:56 +0100
commit75adc4ab5c5833c9afda04d9a0eaf947130c539f (patch)
treea38789f02a7c5cbe3492cb06e0d10d71d7826f03
parentda5e5a5aa23a727ffc7cd3a2eb8cd268ef2f8d06 (diff)
downloadbuildroot-novena-75adc4ab5c5833c9afda04d9a0eaf947130c539f.tar.gz
buildroot-novena-75adc4ab5c5833c9afda04d9a0eaf947130c539f.zip
avahi: bump version, remove dbus workaround
This is now fixed upstream. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/avahi/avahi.mk13
1 files changed, 1 insertions, 12 deletions
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 63215572c..13ae85fc0 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VERSION = 0.6.27
+AVAHI_VERSION = 0.6.28
AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
AVAHI_SITE = http://www.avahi.org/download/
AVAHI_INSTALL_STAGING = YES
@@ -160,19 +160,8 @@ define AVAHI_INSTALL_DAEMON_INITSCRIPT
$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
endef
-# avahi build sys erroneously only installs dbus service if systemd is enabled
-define AVAHI_INSTALL_DAEMON_DBUS_SERVICE
- $(INSTALL) -m 0644 -D $(@D)/avahi-daemon/org.freedesktop.Avahi.service \
- $(TARGET_DIR)/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-endef
-
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
-
-ifeq ($(BR2_PACKAGE_DBUS),y)
-AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_DBUS_SERVICE
-endif
-
endif
$(eval $(call AUTOTARGETS,package,avahi))