avahi: bump version, remove dbus workaround
This is now fixed upstream. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
da5e5a5aa2
commit
75adc4ab5c
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user