Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

knot: merge knot libraries, add explicit dependency versions, library cleanup

Browse source 
Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
This commit is contained in:
Daniel Salzman 2017-08-01 11:40:09 +02:00
parent 5c3c4f7674
commit 207de88a2c
1 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
net/knot/Makefile
View file

@ -28,6 +28,7 @@ define Package/knot-lib/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Knot DNS TITLE:=Knot DNS
DEPENDS=+libpthread
URL:=https://www.knot-dns.cz URL:=https://www.knot-dns.cz
endef endef
@ -36,79 +37,81 @@ define Package/knot/Default
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=IP Addresses and Names SUBMENU:=IP Addresses and Names
TITLE:=Knot DNS TITLE:=Knot DNS
DEPENDS=+libatomic
URL:=https://www.knot-dns.cz URL:=https://www.knot-dns.cz
USERID:=knot=5353:knot=5353 USERID:=knot=5353:knot=5353
endef endef
define Package/knot-libdnssec define Package/knot-libs
$(call Package/knot-lib/Default) $(call Package/knot-lib/Default)
TITLE+= DNSSEC library TITLE+= common DNS and DNSSEC libraries
DEPENDS=+libpthread +libgnutls +jansson DEPENDS+=+libgnutls +jansson
endef
define Package/knot-libknot
$(call Package/knot-lib/Default)
TITLE+= library
DEPENDS=+libpthread +knot-libdnssec
endef endef
define Package/knot-libzscanner define Package/knot-libzscanner
$(call Package/knot-lib/Default) $(call Package/knot-lib/Default)
TITLE+= zone parser library TITLE+= zone parser library
DEPENDS=+libpthread
endef endef
define Package/knot define Package/knot
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= server TITLE+= server with control utility
DEPENDS=+liburcu +libedit +knot-libdnssec +knot-libknot +knot-libzscanner DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \
knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-dig define Package/knot-dig
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= advanced DNS lookup utility TITLE+= advanced DNS lookup utility
DEPENDS=+knot-libdnssec +knot-libknot DEPENDS+=+libedit +knot-libs
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-host define Package/knot-host
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= simple DNS lookup utility TITLE+= simple DNS lookup utility
DEPENDS=+knot-libdnssec +knot-libknot DEPENDS+=+libedit +knot-libs
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-nsupdate define Package/knot-nsupdate
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= dynamic DNS update utility TITLE+= dynamic DNS update utility
DEPENDS=+knot-libdnssec +knot-libknot +knot-libzscanner DEPENDS+=+libedit +knot-libs +knot-libzscanner
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \
knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-zonecheck define Package/knot-zonecheck
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= zonefile check utility TITLE+= zonefile check utility
DEPENDS=+liburcu +knot-libdnssec +knot-libknot +knot-libzscanner DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \
knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-keymgr define Package/knot-keymgr
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= DNSSEC key management utility TITLE+= DNSSEC key management utility
DEPENDS=+liburcu +knot-libdnssec +knot-libknot +knot-libzscanner DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \
knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-tests define Package/knot-tests
$(call Package/knot/Default) $(call Package/knot/Default)
TITLE+= tests TITLE+= tests
DEPENDS=+liburcu +libedit +knot-libdnssec +knot-libknot +knot-libzscanner DEPENDS+=+libedit +liburcu +knot-libs +knot-libzscanner
EXTRA_DEPENDS:=knot-libs (=$(PKG_VERSION)-$(PKG_RELEASE)), \
knot-libzscanner (=$(PKG_VERSION)-$(PKG_RELEASE))
endef endef
define Package/knot-libdnssec/description define Package/knot-libs/description
Knot DNS DNSSEC library. Knot DNS common DNS and DNSSEC libraries.
endef endef
define Package/knot-libknot/description define Package/knot-libzscanner/description
Knot DNS library.
endef
define Package/knot-libdnssec/description
Knot DNS zone parser library. Knot DNS zone parser library.
endef endef
@ -182,13 +185,9 @@ define Build/InstallDev
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
endef endef
define Package/knot-libdnssec/install define Package/knot-libs/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnssec.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnssec.so.* $(1)/usr/lib/
endef
define Package/knot-libknot/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libknot.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libknot.so.* $(1)/usr/lib/
endef endef
@ -279,8 +278,7 @@ define Package/knot-tests/install
cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data $(1)/usr/share/knot/tests/ cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data $(1)/usr/share/knot/tests/
endef endef
$(eval $(call BuildPackage,knot-libdnssec)) $(eval $(call BuildPackage,knot-libs))
$(eval $(call BuildPackage,knot-libknot))
$(eval $(call BuildPackage,knot-libzscanner)) $(eval $(call BuildPackage,knot-libzscanner))
$(eval $(call BuildPackage,knot)) $(eval $(call BuildPackage,knot))
$(eval $(call BuildPackage,knot-dig)) $(eval $(call BuildPackage,knot-dig))