This patch updates the avahi Makefile to correct a number of errors. In
particular it handles the choice of D-BUS- or non-D-BUS-enabled packages
more consistently.
Packages that don't require D-BUS support are compiled with D-BUS
support disabled by default, keeping the build as small as possible.
Support for D-BUS can be selected if desired.
Selecting packages that require D-BUS support -- avahi-utils or
libavahi-client -- will automatically cause all packages to be built
with D-BUS support and will add the D-BUS package to the build.
Note that after this update, the D-BUS package will be needed as part of
the compilation environment, so it will be downloaded and compiled, but
it will not be added to the build unless the user has enabled D-BUS
support or has selected avahi-utils or the avahi-client library, both of
which need it.
Tested on trunk r29283.
Signed-off-by Mike Brady mikebr...@eircom.net
Index: Makefile
===
--- Makefile (revision 29283)
+++ Makefile (working copy)
@@ -7,40 +7,50 @@
include $(TOPDIR)/rules.mk
+ifeq ($(BUILD_VARIANT),dbus)
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION)
+else
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION)
+endif
+
+
PKG_NAME:=avahi
PKG_VERSION:=0.6.30
-PKG_RELEASE:=2
+PKG_RELEASE:=3
+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://avahi.org/download/
PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus
-PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread
-
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=autogen.sh
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
+
+
include $(INCLUDE_DIR)/package.mk
define Package/avahi/Default
SECTION:=net
CATEGORY:=Network
- TITLE:=mDNS/DNS-SD
+ TITLE:=An mDNS/DNS-SD implementation
URL:=http://www.avahi.org/
endef
define Package/avahi/Default/description
- An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library).
- Avahi is a system which facilitates service discovery on a local network --
- this means that you can plug your laptop or computer into a network and
- instantly be able to view other people who you can chat with, find printers
- to print to or find files being shared. This kind of technology is already
- found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
+ Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf)
+ implementation (library). It facilitates
+ service discovery on a local network -- this means that
+ you can plug your laptop or computer into a network and
+ instantly be able to view other people who you can chat with,
+ find printers to print to or find files being shared.
+ This kind of technology is already found in MacOS X
+ (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
and is very convenient.
endef
@@ -50,51 +60,27 @@
CATEGORY:=Libraries
DEPENDS:=+libdaemon +libpthread +libgdbm
TITLE+= (library)
- VARIANT:=nodbus
endef
-define Package/libavahi-dbus
- $(call Package/avahi/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- DEPENDS:=+libdaemon +libpthread +libgdbm +dbus
- TITLE+= (library) (dbus)
- VARIANT:=dbus
-endef
-
define Package/libavahi/description
$(call Package/avahi/Default/description)
.
- This package contains the mDNS/DNS-SD shared libraries, used by other programs.
- Specifically, it provides libavahi-core and libavahi-common libraries.
- This version is compiled without D-Bus support, i.e. the --disable-dbus
- compilation flag is set.
+ The libavahi package contains the mDNS/DNS-SD shared libraries,
+ used by other programs. Specifically, it provides
+ libavahi-core and libavahi-common libraries.
+ By default, it is compiled without D-Bus support,
+ i.e. the --disable-dbus compilation flag is set.
+ To enable D-Bus support, select the package
+ libavahi-dbus-support.
endef
-define Package/libavahi-dbus/description
-$(call Package/avahi/Default/description)
- .
- This package contains the mDNS/DNS-SD shared libraries, used by other programs.
- Specifically, it provides libavahi-core and libavahi-common libraries.
- This version is compiled with D-Bus support
-endef
-
define Package/avahi-autoipd
$(call Package/avahi/Default)
SUBMENU:=IP Addresses and Names
DEPENDS:=+libdaemon
- TITLE:=IPv4LL address conf daemon
- VARIANT:=nodbus
+ TITLE:=IPv4LL network address configuration daemon
endef
-define Package/avahi-autoipd-dbus
- $(call Package/avahi/Default)
- SUBMENU:=IP Addresses and Names
- DEPENDS:=+libdaemon
- TITLE:=IPv4LL address conf daemon (dbus)
- VARIANT:=dbus
-endef
-
define Package/avahi-autoipd/description
$(call Package/avahi/Default/description)
.
@@ -103,114 +89,80 @@
from the link-local 169.254.0.0/16 range
