From 09ea6f03250b278a1c86d7d00406206935ca517d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 20 Jun 2019 11:50:06 -0700 Subject: [PATCH 01/10] kea: Don't install to STAGING_DIR_HOST STAGING_DIR_HOST is for packages under tools/ , not host packages. Reorganized Makefile for consistency between packages. Added PKG/HOST_BUILD_PARALLEL for faster compilation. Signed-off-by: Rosen Penev (cherry picked from commit d93fd61d6274aecd98ff9b1b89461f569c345cd1) --- net/kea/Makefile | 52 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index ec7e92fb8..8ce9823c5 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -10,26 +10,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea PKG_VERSION:=1.5.0 -PKG_RELEASE:=3 -PKG_MAINTAINER:=BangLang Huang, Rosy Song -PKG_BUILD_DEPENDS:=boost log4cplus kea/host -HOST_BUILD_DEPENDS:=boost boost/host log4cplus/host +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)/ - +PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) PKG_HASH:=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 +PKG_MAINTAINER:=BangLang Huang, Rosy Song PKG_LICENSE:=MPL-2.0 +PKG_LICENSE_FILES:=COPYING + +HOST_BUILD_DEPENDS:=boost/host log4cplus/host openssl +PKG_BUILD_DEPENDS:=kea/host +HOST_BUILD_PARALLEL:=1 +PKG_BUILD_PARALLEL:=1 + +PKG_INSTALL:=1 PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) - define Package/kea/Default SECTION:=net CATEGORY:=Network @@ -97,32 +98,33 @@ define Package/kea-perfdhcp DEPENDS:=+kea-libs endef +HOST_CONFIGURE_ARGS += \ + --with-boost-include="$(STAGING_DIR_HOSTPKG)" \ + --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ + --with-openssl="$(STAGING_DIR)/usr" \ + --enable-boost-headers-only \ + --enable-static-link + +HOST_LDFLAGS += \ + -Wl,--gc-sections,--as-needed + CONFIGURE_ARGS += \ + --with-boost-include="$(STAGING_DIR)/usr" \ --with-log4cplus="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \ + --without-pic \ $(if $(CONFIG_PACKAGE_kea-perfdhcp),--enable-perfdhcp,) CONFIGURE_VARS += \ cross_compiling="yes" -HOST_CONFIGURE_ARGS += \ - --enable-static-link \ - --enable-boost-headers-only \ - --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ - --with-boost-include="$(STAGING_DIR)/usr/include" \ - --with-openssl="$(STAGING_DIR)/usr" \ - --without-pic - -HOST_LDFLAGS += \ - -Wl,--gc-sections,--as-needed - TARGET_CXXFLAGS += \ - $(FPIC) \ - -fdata-sections \ - -ffunction-sections + $(FPIC) \ + -fdata-sections \ + -ffunction-sections TARGET_LDFLAGS += \ - -Wl,--gc-sections,--as-needed + -Wl,--gc-sections,--as-needed # Only compile the kea-msg-compiler which we need for # package compilation From efde7c454edc231658f7675eef75692548af7ceb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 3 Jul 2019 20:48:56 -0700 Subject: [PATCH 02/10] kea: Fix compilation without deprecated OpenSSL APIs Forgot to add this one to the last pull request. Signed-off-by: Rosen Penev (cherry picked from commit 54d7bc119d971d80d700406cab56c58e922a65ab) --- net/kea/Makefile | 2 +- net/kea/patches/010-openssl-deprecated.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/kea/patches/010-openssl-deprecated.patch diff --git a/net/kea/Makefile b/net/kea/Makefile index 8ce9823c5..c60ba9d1b 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea PKG_VERSION:=1.5.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) diff --git a/net/kea/patches/010-openssl-deprecated.patch b/net/kea/patches/010-openssl-deprecated.patch new file mode 100644 index 000000000..c8b438efc --- /dev/null +++ b/net/kea/patches/010-openssl-deprecated.patch @@ -0,0 +1,11 @@ +--- a/src/lib/cryptolink/openssl_link.cc ++++ b/src/lib/cryptolink/openssl_link.cc +@@ -79,7 +79,7 @@ CryptoLink::initialize() { + + std::string + CryptoLink::getVersion() { +- return (SSLeay_version(SSLEAY_VERSION)); ++ return (OpenSSL_version(OPENSSL_VERSION)); + } + + } // namespace cryptolink From 07538f535ab0805cc6472f5b274475902f3689cb Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Wed, 24 Jul 2019 10:56:41 +0800 Subject: [PATCH 03/10] kea: remove python3 dependency of kea-admin fix #9495 Signed-off-by: Rosy Song (cherry picked from commit 444420423fbbd707c41343e043d00fa2e843e483) --- net/kea/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index c60ba9d1b..d52a159a4 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -76,7 +76,7 @@ endef define Package/kea-admin $(call Package/kea/Default) TITLE+= Admin - DEPENDS:= +kea-libs +python3 + DEPENDS:= +kea-libs endef define Package/kea-ctrl From 1360d1f88cdc8b61c924e4e982bbb14a6a39656f Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 01:59:36 +0100 Subject: [PATCH 04/10] 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 (cherry picked from commit 95307f2a4b3b64db9244f670f3ea2c7cf3cc2492) --- net/kea/Makefile | 110 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 32 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index d52a159a4..0f6c2b1ae 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 -endef - -define Package/kea-dhcp4 - $(call Package/kea/Default) - TITLE+= DHCP Server v4 - DEPENDS:=+kea-libs -endef - -define Package/kea-dhcp6 - $(call Package/kea/Default) - TITLE+= DHCP Server v6 - DEPENDS:=@IPV6 +kea-libs -endef - -define Package/kea-dhcp-ddns - $(call Package/kea/Default) - TITLE+= DHCP - DDNS - DEPENDS:=+kea-libs -endef - -define Package/kea-admin - $(call Package/kea/Default) - TITLE+= Admin - DEPENDS:= +kea-libs + +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 + 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 + 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 + 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 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 +endef +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 87f4d6ba2c5e3a69fbb2dcd022a0eea4cec3c5be Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 02:03:21 +0100 Subject: [PATCH 05/10] 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 (cherry picked from commit 9314a96765832683326038e4d7c1c162c4ab1677) --- net/kea/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 0f6c2b1ae..4b30ae5c5 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 6f19b894d6ea34eff0eb01de31cdce49f6de7c3e Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Tue, 1 Oct 2019 02:05:15 +0100 Subject: [PATCH 06/10] 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 (cherry picked from commit 74603fe5ea607ad4afb326a68817ded8ac242166) --- net/kea/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 4b30ae5c5..bbbba989e 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 From f22e122e641bd532b8987e0a607762eb9fcc51b8 Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Thu, 10 Oct 2019 23:15:19 +0100 Subject: [PATCH 07/10] kea: update package to 1.6.0 Update kea to the latest stable verion (1.6.0). Signed-off-by: Tiago Gaspar (cherry picked from commit 03cf09333254fa9f58de1d35556a3286849137ff) --- net/kea/Makefile | 10 +-- net/kea/patches/001-fix-cross-compile.patch | 4 +- net/kea/patches/003-no-test-compile.patch | 98 ++++++++++----------- 3 files changed, 54 insertions(+), 58 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index bbbba989e..f0d8c1cc3 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea -PKG_VERSION:=1.5.0 -PKG_RELEASE:=5 +PKG_VERSION:=1.6.0 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) -PKG_HASH:=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec +PKG_HASH:=44ed48c729e4618fffcf0086529b469f7232990983187b2f71fce89f1ac6e270 PKG_MAINTAINER:=BangLang Huang, Rosy Song PKG_LICENSE:=MPL-2.0 @@ -149,7 +149,8 @@ HOST_CONFIGURE_ARGS += \ --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ --with-openssl="$(STAGING_DIR)/usr" \ --enable-boost-headers-only \ - --enable-static-link + --enable-static-link \ + --enable-generate-messages HOST_LDFLAGS += \ -Wl,--gc-sections,--as-needed @@ -229,7 +230,6 @@ define Package/kea-ctrl/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kea-ctrl-agent $(1)/usr/sbin/kea-ctrl-agent $(CP) $(PKG_INSTALL_DIR)/etc/kea/keactrl.conf $(1)/etc/kea/ $(CP) $(PKG_INSTALL_DIR)/etc/kea/kea-ctrl-agent.conf $(1)/etc/kea/ - $(CP) $(PKG_INSTALL_DIR)/etc/kea/kea-netconf.conf $(1)/etc/kea/ endef define Package/kea-lfc/install diff --git a/net/kea/patches/001-fix-cross-compile.patch b/net/kea/patches/001-fix-cross-compile.patch index d3a1521a9..3189c654c 100644 --- a/net/kea/patches/001-fix-cross-compile.patch +++ b/net/kea/patches/001-fix-cross-compile.patch @@ -1,8 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -580,10 +580,10 @@ AC_TRY_COMPILE([ - AC_MSG_RESULT(no)) - +@@ -542,8 +542,8 @@ AC_TRY_COMPILE([ AC_MSG_CHECKING(for usuable C++11 regex) -AC_TRY_RUN([ +AC_TRY_COMPILE([ diff --git a/net/kea/patches/003-no-test-compile.patch b/net/kea/patches/003-no-test-compile.patch index 9b484d5f1..245c660a3 100644 --- a/net/kea/patches/003-no-test-compile.patch +++ b/net/kea/patches/003-no-test-compile.patch @@ -3,7 +3,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + # Install kea-admin in sbin. sbin_SCRIPTS = kea-admin --- a/src/bin/agent/Makefile.am @@ -11,7 +11,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/d2/Makefile.am @@ -19,7 +19,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/dhcp4/Makefile.am @@ -27,7 +27,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/dhcp6/Makefile.am @@ -35,7 +35,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/keactrl/Makefile.am @@ -43,7 +43,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + # Install keactrl in sbin and the keactrl.conf required by the keactrl # in etc. keactrl will look for its configuration file in the etc folder. --- a/src/bin/lfc/Makefile.am @@ -51,7 +51,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/netconf/Makefile.am @@ -59,7 +59,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/perfdhcp/Makefile.am @@ -67,7 +67,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin --- a/src/bin/shell/Makefile.am @@ -75,15 +75,15 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py - + --- a/src/hooks/dhcp/high_availability/Makefile.am +++ b/src/hooks/dhcp/high_availability/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/hooks/dhcp/lease_cmds/Makefile.am @@ -91,7 +91,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/hooks/dhcp/stat_cmds/Makefile.am @@ -99,7 +99,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/hooks/dhcp/user_chk/Makefile.am @@ -107,7 +107,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/asiodns/Makefile.am @@ -115,7 +115,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/asiolink/Makefile.am @@ -123,7 +123,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/cc/Makefile.am @@ -131,7 +131,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/cfgrpt/Makefile.am @@ -139,7 +139,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CXXFLAGS = $(KEA_CXXFLAGS) --- a/src/lib/config/Makefile.am @@ -147,7 +147,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/config_backend/Makefile.am @@ -155,7 +155,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/cql/Makefile.am @@ -163,7 +163,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(CQL_CPPFLAGS) --- a/src/lib/cryptolink/Makefile.am @@ -171,7 +171,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) --- a/src/lib/database/Makefile.am @@ -179,7 +179,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/dhcp/Makefile.am @@ -187,7 +187,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/dhcp_ddns/Makefile.am @@ -195,27 +195,27 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = subdir-objects - + -SUBDIRS = . testutils tests benchmarks +SUBDIRS = . benchmarks - + dhcp_data_dir = @localstatedir@/@PACKAGE@ kea_lfc_location = @prefix@/sbin/kea-lfc --- a/src/lib/dns/Makefile.am +++ b/src/lib/dns/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = subdir-objects - + -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/eval/Makefile.am @@ -223,7 +223,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/exceptions/Makefile.am @@ -231,7 +231,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CXXFLAGS=$(KEA_CXXFLAGS) --- a/src/lib/hooks/Makefile.am @@ -239,7 +239,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/http/Makefile.am @@ -247,17 +247,15 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/log/Makefile.am +++ b/src/lib/log/Makefile.am -@@ -2,7 +2,6 @@ SUBDIRS = interprocess . - if !CROSS_COMPILING - SUBDIRS += compiler - endif --SUBDIRS += tests - +@@ -1,4 +1,4 @@ +-SUBDIRS = interprocess . compiler tests ++SUBDIRS = interprocess . compiler + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/log/interprocess/Makefile.am @@ -265,7 +263,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\" --- a/src/lib/mysql/Makefile.am @@ -273,7 +271,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS) --- a/src/lib/pgsql/Makefile.am @@ -281,7 +279,7 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS) --- a/src/lib/process/Makefile.am @@ -289,25 +287,25 @@ @@ -1,4 +1,4 @@ -SUBDIRS = . testutils tests +SUBDIRS = . - dhcp_data_dir = @localstatedir@/@PACKAGE@ + # DATA_DIR is the directory where to put PID files. + dhcp_data_dir = @runstatedir@/@PACKAGE@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib - AM_CPPFLAGS += -DDATA_DIR="\"$(dhcp_data_dir)\"" --- a/src/lib/stats/Makefile.am +++ b/src/lib/stats/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = subdir-objects - + -SUBDIRS = . io unittests tests python threads +SUBDIRS = . io python threads - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) --- a/src/lib/util/threads/Makefile.am @@ -316,13 +314,13 @@ -SUBDIRS = . tests +SUBDIRS = . AM_CXXFLAGS = $(KEA_CXXFLAGS) - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . testutils pretests tests +SUBDIRS = . - + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_CPPFLAGS) From 1d30a273e17a1a1adf05acb720ec06547d67c488 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 22 Oct 2019 10:27:26 -0700 Subject: [PATCH 08/10] kea: Remove openssl host dependency OpenSSL is already built as part of tools (LibreSSL actually) and can be used instead for the host build. Signed-off-by: Rosen Penev (cherry picked from commit c037c8d988027453214849a098232f86dd4ca4d4) --- net/kea/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index f0d8c1cc3..72ce46b9c 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea PKG_VERSION:=1.6.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) @@ -20,7 +20,7 @@ PKG_MAINTAINER:=BangLang Huang, Rosy Song Date: Mon, 16 Mar 2020 16:00:52 +0000 Subject: [PATCH 09/10] kea: Update kea to the latest stable verion (1.6.2). Signed-off-by: Tiago Gaspar (cherry picked from commit 0f4cc2e339f4633b0e8c0b922d8f38c2fdba14b4) --- net/kea/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 72ce46b9c..178ab2caa 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea -PKG_VERSION:=1.6.0 -PKG_RELEASE:=7 +PKG_VERSION:=1.6.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION) -PKG_HASH:=44ed48c729e4618fffcf0086529b469f7232990983187b2f71fce89f1ac6e270 +PKG_HASH:=2af7336027143c3e98d8d1d44165b2c2cbb0252a92bd88f6dd4d2c6adb69d7b5 PKG_MAINTAINER:=BangLang Huang, Rosy Song PKG_LICENSE:=MPL-2.0 From 5a1699aebd6b716e6dc545dc24d018a2d6a16f36 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Mar 2020 19:55:55 -0700 Subject: [PATCH 10/10] kea: do not build static host binaries Errors on some systems. No real change. Signed-off-by: Rosen Penev (cherry picked from commit 1950340c697c537ab9d8d117f1b3ea08fe4bf1c1) --- net/kea/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 178ab2caa..1f4b58ac4 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -149,7 +149,6 @@ HOST_CONFIGURE_ARGS += \ --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ --with-openssl="$(STAGING_DIR_HOST)" \ --enable-boost-headers-only \ - --enable-static-link \ --enable-generate-messages HOST_LDFLAGS += \