ntpd: Include sntp binary only with ntp-utils

Don't build the sntp binary and libevent2-pthread dependency unless
ntp-utils is selected.

Re-add ntp-keygen dependency libevent2-core.

Fixes openwrt#10307

Signed-off-by: Kenneth J. Miller <ken@miller.ec>

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index ff82af24c439fbb7ad091df507c68b612c7efac9..28be8b50129a6b73ead40ef149ff5c9f5e776844 100644 (file)
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.8p15
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
@@ -33,7 +33,7 @@ define Package/ntpd/Default
   TITLE:=ISC ntp
   MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.ntp.org/
-  DEPENDS:=+libopenssl +libpthread +libcap +libevent2-pthreads
+  DEPENDS:=+libopenssl +libpthread +libcap
 endef
 
 define Package/ntpd/Default/description
@@ -69,17 +69,19 @@ endef
 define Package/ntp-utils
 $(call Package/ntpd/Default)
   TITLE+= utilities
+  DEPENDS+= +libevent2-pthreads
 endef
 
 define Package/ntp-utils/description
 $(call Package/ntpd/Default/description)
  .
- This package contains ntpdc, ntpq and ntptime.
+ This package contains ntpdc, ntpq, ntptime and sntp.
 endef
 
 define Package/ntp-keygen
 $(call Package/ntpd/Default)
   TITLE+=keygen
+  DEPENDS+= +libevent2-core
 endef
 
 define Package/ntp-keygen/description
@@ -107,6 +109,7 @@ CONFIGURE_ARGS += \
        --enable-linuxcaps \
        --with-yielding-select=yes \
        --with-crypto \
+       $(if $(CONFIG_PACKAGE_ntp-utils),--with-sntp,--without-sntp) \
        --with-openssl-incdir="$(STAGING_DIR)/usr/include" \
        --with-openssl-libdir="$(STAGING_DIR)/usr/lib"
 
@@ -145,6 +148,7 @@ define Package/ntp-utils/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpdc/ntpdc $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpq/ntpq $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/util/ntptime $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/sntp/sntp $(1)/usr/sbin/
 endef
 
 define Package/ntp-keygen/install