From 95307f2a4b3b64db9244f670f3ea2c7cf3cc2492 Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 01:59:36 +0100 Subject: [PATCH 1/3] kea: fix and improve makefile Fix an issue where the Makefile wouldn't allow kea to show up in the menuconfig Also added some description to the packages Signed-off-by: Tiago Gaspar --- net/kea/Makefile | 78 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index d52a159a41d99..0f6c2b1ae6a30 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -39,6 +39,13 @@ define Package/kea/Default URL:=https://www.isc.org/kea endef + +###### ************************************************************************* +define Package/kea + $(call Package/kea/Default) + TITLE+=ISC Kea +endef +# shown in LuCI package description define Package/kea/description Kea is an open source DHCPv4/DHCPv6 server being developed by Internet Systems Consortium. Kea is a high-performance, extensible DHCP server @@ -48,56 +55,95 @@ define Package/kea/description management REST interface, and a DHCP benchmarking tool, perfdhcp. endef +###### ************************************************************************* define Package/kea-libs $(call Package/kea/Default) - TITLE+= Libraries + TITLE+=Libraries DEPENDS:=+libopenssl +log4cplus \ - +boost +boost-python3 +boost-system + +boost +boost-python3 +boost-system +endef +define Package/kea-libs/description + Kea required Libraries. +endef + +###### ************************************************************************* +define Package/kea-ctrl + $(call Package/kea/Default) + TITLE+=Control + DEPENDS:=+kea-dhcp4 \ + +IPV6:kea-dhcp6 +kea-dhcp-ddns +endef +define Package/kea-ctrl/description + Tool to start, stop, reconfigure, and report status for the Kea servers. endef +###### ************************************************************************* define Package/kea-dhcp4 $(call Package/kea/Default) - TITLE+= DHCP Server v4 + TITLE+=DHCP Server v4 DEPENDS:=+kea-libs endef +define Package/kea-dhcp4/description + The DHCPv4 server process. This process responds to DHCPv4 queries from clients. +endef +###### ************************************************************************* define Package/kea-dhcp6 $(call Package/kea/Default) - TITLE+= DHCP Server v6 + TITLE+=DHCP Server v6 DEPENDS:=@IPV6 +kea-libs endef +define Package/kea-dhcp6/description + The DHCPv6 server process. This process responds to DHCPv6 queries from clients. +endef +###### ************************************************************************* define Package/kea-dhcp-ddns $(call Package/kea/Default) - TITLE+= DHCP - DDNS + TITLE+=DHCP Dynamic DNS DEPENDS:=+kea-libs endef +define Package/kea-dhcp-ddns/description + The DHCP Dynamic DNS process. This process acts as an intermediary between +the DHCP servers and DNS servers. It receives name update requests from the +DHCP servers and sends DNS Update messages to the DNS servers. +endef +###### ************************************************************************* define Package/kea-admin $(call Package/kea/Default) - TITLE+= Admin - DEPENDS:= +kea-libs + TITLE+=Admin + DEPENDS:=+kea-libs endef - -define Package/kea-ctrl - $(call Package/kea/Default) - TITLE+= Control - DEPENDS:= +kea-dhcp4 +IPV6:kea-dhcp6 \ - +kea-dhcp-ddns +define Package/kea-admin/description + A useful tool for database backend maintenance (creating a new database, +checking versions, upgrading etc.). endef +##### ************************************************************************* define Package/kea-lfc $(call Package/kea/Default) - TITLE+= lfc + TITLE+=lfc DEPENDS:=+kea-libs endef +define Package/kea-lfc/description + This process removes redundant information from the files used to provide +persistent storage for the memfile data base backend. While it can be run +standalone, it is normally run as and when required by the Kea DHCP servers. +endef +##### ************************************************************************* define Package/kea-perfdhcp $(call Package/kea/Default) - TITLE+= perfdhcp + TITLE+=perfdhcp (Benchmarking) DEPENDS:=+kea-libs endef +define Package/kea-perfdhcp/description + A DHCP benchmarking tool which simulates multiple clients to test both +DHCPv4 and DHCPv6 server performance. +endef +###### ************************************************************************* HOST_CONFIGURE_ARGS += \ --with-boost-include="$(STAGING_DIR_HOSTPKG)" \ --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ @@ -198,10 +244,10 @@ endef $(eval $(call HostBuild)) $(eval $(call BuildPackage,kea-libs)) +$(eval $(call BuildPackage,kea-ctrl)) $(eval $(call BuildPackage,kea-dhcp4)) $(eval $(call BuildPackage,kea-dhcp6)) $(eval $(call BuildPackage,kea-dhcp-ddns)) $(eval $(call BuildPackage,kea-admin)) -$(eval $(call BuildPackage,kea-ctrl)) $(eval $(call BuildPackage,kea-lfc)) $(eval $(call BuildPackage,kea-perfdhcp)) From 9314a96765832683326038e4d7c1c162c4ab1677 Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 02:03:21 +0100 Subject: [PATCH 2/3] kea: fix kea-admin dependency Fix kea-admin dependency where if procps-ng-ps wasn't available busybox would output an error casuse it does't support showing a processe's PID Signed-off-by: Tiago Gaspar --- net/kea/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 0f6c2b1ae6a30..4b30ae5c53be8 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -70,7 +70,7 @@ endef define Package/kea-ctrl $(call Package/kea/Default) TITLE+=Control - DEPENDS:=+kea-dhcp4 \ + DEPENDS:=+procps-ng +procps-ng-ps +kea-dhcp4 \ +IPV6:kea-dhcp6 +kea-dhcp-ddns endef define Package/kea-ctrl/description From 74603fe5ea607ad4afb326a68817ded8ac242166 Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 02:05:15 +0100 Subject: [PATCH 3/3] kea: remove dependency and reduce file size Remove boost-python3 dependency and reduce file size of the compiled kea-libs Signed-off-by: Tiago Gaspar --- net/kea/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 4b30ae5c53be8..bbbba989eb039 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -60,7 +60,7 @@ define Package/kea-libs $(call Package/kea/Default) TITLE+=Libraries DEPENDS:=+libopenssl +log4cplus \ - +boost +boost-python3 +boost-system + +boost +boost-system endef define Package/kea-libs/description Kea required Libraries. @@ -197,7 +197,7 @@ endef define Package/kea-libs/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ endef define Package/kea-dhcp4/install