Signed-off-by: Matthias Klein <matthias.kl...@optimeas.de>
---
v2:
- Use -M option for git send-email
---
.../Fix-undefined-MOD_NANO.patch | 0
patches/{ntp-4.2.6p5 => ntp-4.2.8p7}/series | 0
rules/ntp.make | 21 ++++++++++++++-------
rules/ntp_nonparse.in | 12 ++++++++----
rules/ntp_parse.in | 4 ++++
5 files changed, 26 insertions(+), 11 deletions(-)
rename patches/{ntp-4.2.6p5 => ntp-4.2.8p7}/Fix-undefined-MOD_NANO.patch (100%)
rename patches/{ntp-4.2.6p5 => ntp-4.2.8p7}/series (100%)
diff --git a/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch
b/patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch
similarity index 100%
rename from patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch
rename to patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch
diff --git a/patches/ntp-4.2.6p5/series b/patches/ntp-4.2.8p7/series
similarity index 100%
rename from patches/ntp-4.2.6p5/series
rename to patches/ntp-4.2.8p7/series
diff --git a/rules/ntp.make b/rules/ntp.make
index ba06543..1f7bc3e 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NTP) += ntp
#
# Paths and names
#
-NTP_VERSION := 4.2.6p5
-NTP_MD5 := 00df80a84ec9528fcfb09498075525bc
+NTP_VERSION := 4.2.8p7
+NTP_MD5 := 46dfba933c3e4bc924d8e55068797578
NTP := ntp-$(NTP_VERSION)
NTP_SUFFIX := tar.gz
NTP_URL :=
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
@@ -40,10 +40,11 @@ NTP_ENV := \
#
NTP_AUTOCONF := $(CROSS_AUTOCONF_USR) \
$(GLOBAL_IPV6_OPTION) \
- --with-binsubdir=sbin \
+ --bindir=/usr/sbin \
--without-lineeditlibs \
--without-net-snmp-config \
- --disable-linuxcaps
+ --disable-linuxcaps \
+ --with-yielding-select=yes
ifdef PTXCONF_NTP_ALL_CLOCK_DRIVERS
NTP_AUTOCONF += --enable-all-clocks
@@ -105,6 +106,9 @@ endif
ifdef PTXCONF_NTP_FG
NTP_AUTOCONF += --enable-FG
endif
+ifdef PTXCONF_NTP_GPSD
+NTP_AUTOCONF += --enable-GPSD
+endif
ifdef PTXCONF_NTP_HEATH
NTP_AUTOCONF += --enable-HEATH
endif
@@ -162,6 +166,9 @@ endif
ifdef PTXCONF_NTP_RIPENCC
NTP_AUTOCONF += --enable-RIPENCC
endif
+ifdef PTXCONF_NTP_SEL240X
+NTP_AUTOCONF += --enable-SEL240X
+endif
ifdef PTXCONF_NTP_SHM
NTP_AUTOCONF += --enable-SHM
endif
@@ -177,15 +184,15 @@ endif
ifdef PTXCONF_NTP_TRUETIME
NTP_AUTOCONF += --enable-TRUETIME
endif
+ifdef PTXCONF_NTP_TSYNCPCI
+NTP_AUTOCONF += --enable-TSYNCPCI
+endif
ifdef PTXCONF_NTP_TT560
NTP_AUTOCONF += --enable-TT560
endif
ifdef PTXCONF_NTP_ULINK
NTP_AUTOCONF += --enable-ULINK
endif
-ifdef PTXCONF_NTP_USNO
-NTP_AUTOCONF += --enable-USNO
-endif
ifdef PTXCONF_NTP_WWV
NTP_AUTOCONF += --enable-WWV
endif
diff --git a/rules/ntp_nonparse.in b/rules/ntp_nonparse.in
index f2ecd7b..397b6e0 100644
--- a/rules/ntp_nonparse.in
+++ b/rules/ntp_nonparse.in
@@ -54,6 +54,10 @@ config NTP_FG
bool
prompt "Forum Graphic GPS"
+config NTP_GPSD
+ bool
+ prompt "GPSD JSON receiver"
+
config NTP_HEATH
bool
prompt "Heath GC-1000 WWV/WWVH receiver "
@@ -158,6 +162,10 @@ config NTP_TRUETIME
bool
prompt "Kinemetrics/TrueTime receivers"
+config NTP_TSYNCPCI
+ bool
+ prompt "Spectracom TSYNC timing board"
+
config NTP_TT560
bool
prompt "TrueTime 560 IRIG-B decoder [BROKEN]"
@@ -167,10 +175,6 @@ config NTP_ULINK
bool
prompt "Ultralink WWVB receiver"
-config NTP_USNO
- bool
- prompt "USNO modem service"
-
config NTP_WWV
bool
prompt "WWV Audio receiver"
diff --git a/rules/ntp_parse.in b/rules/ntp_parse.in
index a8f8832..8e0a153 100644
--- a/rules/ntp_parse.in
+++ b/rules/ntp_parse.in
@@ -32,6 +32,10 @@ config NTP_RCC8000
bool
prompt "RCC 8000 clock"
+config NTP_SEL240X
+ bool
+ prompt "SEL240X clock"
+
config NTP_SCHMID
bool
prompt "Schmid DCF77 clock"
--
2.1.4
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
