Changeset 27479 for packages


Ignore:
Timestamp:
2011-07-06T10:19:14+02:00 (5 years ago)
Author:
cshore
Message:

[packages] libs/avahi: fixed mutating libavahi/avahi-daemon. The package was producing a package avahi which required dbus if libavahi-dbus-support was selected (even as module), and without dbus if that package was not select. This has been fixed so that there are now dbus versions of the binary packages and non-dbus versions of the ones that can be without dbus, so that the smaller platformas can still have avahi without dbus, and those who want the dbus avahi can have it as well.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/avahi/Makefile

    r26502 r27479  
    1616PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 
    1717 
    18 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus 
     18PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
     19 
     20PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread 
    1921 
    2022PKG_FIXUP:=autoreconf 
     
    2931  SECTION:=net 
    3032  CATEGORY:=Network 
    31   TITLE:=An mDNS/DNS-SD implementation 
     33  TITLE:=mDNS/DNS-SD  
    3234  URL:=http://www.avahi.org/ 
    3335endef 
     
    4951  DEPENDS:=+libdaemon +libpthread +libgdbm 
    5052  TITLE+= (library) 
     53  VARIANT:=nodbus 
     54endef 
     55 
     56define Package/libavahi-dbus 
     57  $(call Package/avahi/Default) 
     58  SECTION:=libs 
     59  CATEGORY:=Libraries 
     60  DEPENDS:=+libdaemon +libpthread +libgdbm +dbus 
     61  TITLE+= (library) (dbus) 
     62  VARIANT:=dbus 
    5163endef 
    5264 
     
    5668 This package contains the mDNS/DNS-SD shared libraries, used by other programs. 
    5769 Specifically, it provides libavahi-core and libavahi-common libraries. 
    58  By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. 
    59  To enable D-Bus support, select the package libavahi-dbus-support. 
     70 This version is compiled without D-Bus support, i.e. the --disable-dbus  
     71 compilation flag is set. 
     72endef 
     73 
     74define Package/libavahi-dbus/description 
     75$(call Package/avahi/Default/description) 
     76 . 
     77 This package contains the mDNS/DNS-SD shared libraries, used by other programs. 
     78 Specifically, it provides libavahi-core and libavahi-common libraries. 
     79 This version is compiled with D-Bus support 
    6080endef 
    6181 
     
    6484  SUBMENU:=IP Addresses and Names 
    6585  DEPENDS:=+libdaemon 
    66   TITLE:=IPv4LL network address configuration daemon 
     86  TITLE:=IPv4LL address conf daemon 
     87  VARIANT:=nodbus 
     88endef 
     89 
     90define Package/avahi-autoipd-dbus 
     91  $(call Package/avahi/Default) 
     92  SUBMENU:=IP Addresses and Names 
     93  DEPENDS:=+libdaemon 
     94  TITLE:=IPv4LL address conf daemon (dbus) 
     95  VARIANT:=dbus 
    6796endef 
    6897 
     
    75104 server. It is primarily intended to be used in ad-hoc networks which lack a 
    76105 DHCP server. 
     106 . 
     107 This verison is compile along with non-D-Bus version of libavahi. 
     108endef 
     109 
     110define Package/avahi-autoipd-dbus/description 
     111$(call Package/avahi/Default/description) 
     112 . 
     113 This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local  
     114 Addresses" (IETF RFC3927), a protocol for automatic IP address configuration  
     115 from the link-local 169.254.0.0/16 range without the need for a central  
     116 server. It is primarily intended to be used in ad-hoc networks which lack a 
     117 DHCP server. 
     118 . 
     119 This version is compiled along with the D-Bus version of libavahi. 
    77120endef 
    78121 
     
    82125  DEPENDS:=+libavahi +libexpat 
    83126  TITLE+= (daemon) 
     127  VARIANT:=nodbus 
     128endef 
     129 
     130define Package/avahi-daemon-dbus 
     131  $(call Package/avahi/Default) 
     132  SUBMENU:=IP Addresses and Names 
     133  DEPENDS:=+libavahi-dbus +libexpat 
     134  TITLE+= (daemon) (dbus) 
     135  VARIANT:=dbus 
    84136endef 
    85137 
     
    88140 . 
    89141 This package contains an mDNS/DNS-SD daemon. 
     142endef 
     143 
     144define Package/avahi-daemon-dbus/description 
     145$(call Package/avahi/Default/description) 
     146 . 
     147 This package contains an mDNS/DNS-SD daemon with dbus support. 
    90148endef 
    91149 
     
    96154endef 
    97155 
     156define Package/avahi-daemon-dbus/conffiles 
     157/etc/avahi/avahi-daemon.conf 
     158/etc/avahi/services/http.service 
     159/etc/avahi/services/ssh.service 
     160endef 
     161 
    98162define Package/avahi-dnsconfd 
    99163  $(call Package/avahi/Default) 
     
    101165  DEPENDS:=+libavahi 
    102166  TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon 
     167  VARIANT:=nodbus 
     168endef 
     169 
     170define Package/avahi-dnsconfd-dbus 
     171  $(call Package/avahi/Default) 
     172  SUBMENU:=IP Addresses and Names 
     173  DEPENDS:=+libavahi-dbus 
     174  TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon with dbus support 
     175  VARIANT:=dbus 
    103176endef 
    104177 
     
    109182 daemon, which may be used to configure conventional DNS servers using mDNS 
    110183 in a DHCP-like fashion. Especially useful on IPv6. 
    111 endef 
    112  
    113 define Package/libavahi-dbus-support 
     184 . 
     185 This version does not have D-Bus support. 
     186endef 
     187 
     188define Package/avahi-dnsconfd-dbus/description 
     189$(call Package/avahi/Default/description) 
     190 . 
     191 This package contains a Unicast DNS server from mDNS/DNS-SD configuration 
     192 daemon, which may be used to configure conventional DNS servers using mDNS 
     193 in a DHCP-like fashion. Especially useful on IPv6. 
     194 . 
     195 This version has D-Bus support. 
     196endef 
     197 
     198define Package/libavahi-client 
    114199  $(call Package/avahi/Default) 
    115200  SECTION:=libs 
    116201  CATEGORY:=Libraries 
    117   VARIANT:=dbus 
    118   DEPENDS:=+dbus +libavahi 
    119   TITLE+= (D-Bus support for advanced features) 
    120 endef 
    121  
    122 define Package/libavahi-dbus-support/description 
    123 $(call Package/libavahi/description) 
    124  . 
    125  This package enables D-Bus support in libavahi. This is needed for libavahi to 
    126  provide advanced features -- support for avahi-browse, avahi-publish 
    127  and the libavahi-client library. 
    128  It requires the D-Bus package to be included in the build. 
    129  Selecting this modifies the contents of the libavahi package by setting 
    130  the --enable-dbus compilation flag; it does not generate a separate package of its own. 
    131 endef 
    132  
    133 define Package/libavahi-client 
    134   $(call Package/avahi/Default) 
    135   SECTION:=libs 
    136   CATEGORY:=Libraries 
    137   DEPENDS:=+libavahi-dbus-support 
     202  DEPENDS:=+libavahi-dbus 
    138203  TITLE+= (libavahi-client library) 
     204  VARIANT:=dbus 
    139205endef 
    140206 
     
    144210 This packages adds the libavahi-client library. 
    145211 For more information please see the avahi documentation. 
     212 . 
     213 Requires D-Bus support. 
    146214endef 
    147215 
     
    151219  DEPENDS:=+libavahi-client 
    152220  TITLE+= (utilities) 
     221  VARIANT:=dbus 
    153222endef 
    154223 
     
    159228 avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name. 
    160229 For more information please see the avahi documentation. 
     230 . 
     231 Requires D-Bus support. 
    161232endef 
    162233 
     
    206277CONFIGURE_ARGS += \ 
    207278        --enable-dbus 
    208 else 
     279endif 
     280ifeq ($(BUILD_VARIANT),nodbus) 
    209281CONFIGURE_ARGS += \ 
    210282        --disable-dbus   
     
    223295endef 
    224296 
    225 define Package/libavahi-dbus-support/install 
     297define Package/libavahi-dbus/install 
    226298        $(INSTALL_DIR) $(1)/usr/lib 
     299        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ 
     300        $(INSTALL_DIR) $(1)/etc/dbus-1/system.d 
     301        $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d 
    227302endef 
    228303 
     
    230305        $(INSTALL_DIR) $(1)/usr/lib 
    231306        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ 
    232 ifeq ($(BUILD_VARIANT),dbus) 
    233         $(INSTALL_DIR) $(1)/etc/dbus-1/system.d 
    234         $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d 
    235 endif 
    236307endef 
    237308 
     
    265336endef 
    266337 
     338define Package/avahi-daemon-dbus/install 
     339        $(INSTALL_DIR) $(1)/usr/sbin 
     340        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ 
     341        $(INSTALL_DIR) $(1)/etc/avahi 
     342        $(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/ 
     343        $(INSTALL_DIR) $(1)/etc/avahi/services 
     344        $(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service 
     345        $(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service 
     346        $(INSTALL_DIR) $(1)/etc/init.d 
     347        $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon 
     348endef 
     349 
    267350define Package/avahi-dnsconfd/install 
     351        $(INSTALL_DIR) $(1)/etc/avahi 
     352        $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ 
     353        $(INSTALL_DIR) $(1)/usr/sbin 
     354        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ 
     355endef 
     356 
     357define Package/avahi-dnsconfd-dbus/install 
    268358        $(INSTALL_DIR) $(1)/etc/avahi 
    269359        $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ 
     
    274364$(eval $(call BuildPackage,libavahi-client)) 
    275365$(eval $(call BuildPackage,avahi-utils)) 
    276 $(eval $(call BuildPackage,libavahi-dbus-support)) 
     366$(eval $(call BuildPackage,libavahi-dbus)) 
    277367$(eval $(call BuildPackage,libavahi)) 
    278368$(eval $(call BuildPackage,avahi-autoipd)) 
     369$(eval $(call BuildPackage,avahi-autoipd-dbus)) 
    279370$(eval $(call BuildPackage,avahi-daemon)) 
     371$(eval $(call BuildPackage,avahi-daemon-dbus)) 
    280372$(eval $(call BuildPackage,avahi-dnsconfd)) 
    281  
     373$(eval $(call BuildPackage,avahi-dnsconfd-dbus)) 
     374 
Note: See TracChangeset for help on using the changeset viewer.