[ptxdist] Fw: [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

[ptxdist] Fw: [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

[Matthias Klein]

Hello,

is this patch OK?


Best regards,
Matthias


------ Weitergeleitete Nachricht ------
Von: "Matthias Klein" <matthias.klein@optimeas.de>
An: ptxdist@pengutronix.de
Gesendet: 22.06.2016 15:48:56
Betreff: [ptxdist] [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

Signed-off-by: Matthias Klein <matthias.klein@optimeas.de>
---
  patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch | 42 
------------------------
  patches/ntp-4.2.6p5/series                       |  1 -
  patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch | 42 
++++++++++++++++++++++++
  patches/ntp-4.2.8p7/series                       |  1 +
  rules/ntp.make                                   | 21 ++++++++----
  rules/ntp_nonparse.in                            | 12 ++++---
  rules/ntp_parse.in                               |  4 +++
  7 files changed, 69 insertions(+), 54 deletions(-)
  delete mode 100644 patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch
  delete mode 100644 patches/ntp-4.2.6p5/series
  create mode 100644 patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch
  create mode 100644 patches/ntp-4.2.8p7/series

diff --git a/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch 
b/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch
deleted file mode 100644
index f4200cf..0000000
--- a/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001
-From: Alexander Stein <alexander.stein@systec-electronic.com>
-Date: Tue, 5 Jan 2010 13:13:02 +0100
-Subject: [PATCH] Fix undefined MOD_NANO
-
-With gcc version 4.4.1 (Sourcery G++ Lite 2009q3-67) I get this error:
-
-ntp_loopfilter.c: In function 'local_clock':
-ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this 
function)
-ntp_loopfilter.c:571: error: (Each undeclared identifier is reported 
only once
-ntp_loopfilter.c:571: error: for each function it appears in.)
-ntp_loopfilter.c: In function 'loop_config':
-ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this 
function)
-make[4]: *** [ntp_loopfilter.o] Error 1
-
-Fix it by chaning MOD_NANO to STA_NANO.
-
-This may be related to some specific toolchains, due to some defines. I 
use the
-Codesourcery Sourcery G++ Lite 2009q3-67 toolchain.
-
-Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-#mkl: ported to ntp-4.2.6
-
- ntpd/ntp_loopfilter.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ntp-4.2.6/ntpd/ntp_loopfilter.c
-===================================================================
---- ntp-4.2.6.orig/ntpd/ntp_loopfilter.c
-+++ ntp-4.2.6/ntpd/ntp_loopfilter.c
-@@ -517,7 +517,7 @@ local_clock(
- ntv.modes = MOD_STATUS;
- } else {
- #ifdef STA_NANO
-- ntv.modes = MOD_BITS | MOD_NANO;
-+ ntv.modes = MOD_BITS | STA_NANO;
- #else /* STA_NANO */
- ntv.modes = MOD_BITS;
- #endif /* STA_NANO */
diff --git a/patches/ntp-4.2.6p5/series b/patches/ntp-4.2.6p5/series
deleted file mode 100644
index 6a7679c..0000000
--- a/patches/ntp-4.2.6p5/series
+++ /dev/null
@@ -1 +0,0 @@
-Fix-undefined-MOD_NANO.patch
diff --git a/patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch 
b/patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch
new file mode 100644
index 0000000..f4200cf
--- /dev/null
+++ b/patches/ntp-4.2.8p7/Fix-undefined-MOD_NANO.patch
@@ -0,0 +1,42 @@
+From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001
+From: Alexander Stein <alexander.stein@systec-electronic.com>
+Date: Tue, 5 Jan 2010 13:13:02 +0100
+Subject: [PATCH] Fix undefined MOD_NANO
+
+With gcc version 4.4.1 (Sourcery G++ Lite 2009q3-67) I get this error:
+
+ntp_loopfilter.c: In function 'local_clock':
+ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this 
function)
+ntp_loopfilter.c:571: error: (Each undeclared identifier is reported 
only once
+ntp_loopfilter.c:571: error: for each function it appears in.)
+ntp_loopfilter.c: In function 'loop_config':
+ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this 
function)
+make[4]: *** [ntp_loopfilter.o] Error 1
+
+Fix it by chaning MOD_NANO to STA_NANO.
+
+This may be related to some specific toolchains, due to some defines. I 
use the
+Codesourcery Sourcery G++ Lite 2009q3-67 toolchain.
+
+Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+---
+#mkl: ported to ntp-4.2.6
+
+ ntpd/ntp_loopfilter.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ntp-4.2.6/ntpd/ntp_loopfilter.c
+===================================================================
+--- ntp-4.2.6.orig/ntpd/ntp_loopfilter.c
++++ ntp-4.2.6/ntpd/ntp_loopfilter.c
+@@ -517,7 +517,7 @@ local_clock(
+ ntv.modes = MOD_STATUS;
+ } else {
+ #ifdef STA_NANO
+- ntv.modes = MOD_BITS | MOD_NANO;
++ ntv.modes = MOD_BITS | STA_NANO;
+ #else /* STA_NANO */
+ ntv.modes = MOD_BITS;
+ #endif /* STA_NANO */
diff --git a/patches/ntp-4.2.8p7/series b/patches/ntp-4.2.8p7/series
new file mode 100644
index 0000000..6a7679c
--- /dev/null
+++ b/patches/ntp-4.2.8p7/series
@@ -0,0 +1 @@
+Fix-undefined-MOD_NANO.patch
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


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Fw: [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

[Uwe Kleine-König]

On Fri, Jul 29, 2016 at 06:35:22AM +0000, Matthias Klein wrote:
> is this patch OK?

For improved readability use -M to git-format-patch and make sure to not
let your mailer add line breaks.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Fw: [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

[Matthias Klein]

Hello Uwe,
>>  is this patch OK?
>
>For improved readability use -M to git-format-patch and make sure to 
>not
>let your mailer add line breaks.
I let git send the original patch with this command:

git send-email -1 --annotate --signoff --suppress-cc=self 
--subject-prefix="PATCH" --to ptxdist@pengutronix.de


Is this not OK?

Should I resend the patch?


Best regards,
Matthias


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Fw: [PATCH] ntp: version bump 4.2.6p5 -> 4.2.8p7

[Uwe Kleine-König]

Hallo,

On Fri, Jul 29, 2016 at 06:56:16AM +0000, Matthias Klein wrote:
> >> is this patch OK?
> >
> >For improved readability use -M to git-format-patch and make sure to not
> >let your mailer add line breaks.
> I let git send the original patch with this command:
> 
> git send-email -1 --annotate --signoff --suppress-cc=self
> --subject-prefix="PATCH" --to ptxdist@pengutronix.de

you can (and should) add -M to git send-email then. It is then passed to
format-patch.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de