From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WLcRZ-00065g-Jx for ptxdist@pengutronix.de; Thu, 06 Mar 2014 18:50:53 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1WLcRZ-0002Gx-IT for ptxdist@pengutronix.de; Thu, 06 Mar 2014 18:50:53 +0100 Date: Thu, 6 Mar 2014 18:50:53 +0100 From: Michael Olbrich Message-ID: <20140306175053.GM32080@pengutronix.de> References: <1393398425-25037-1-git-send-email-bth@kamstrup.dk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1393398425-25037-1-git-send-email-bth@kamstrup.dk> Subject: Re: [ptxdist] [PATCH] ntp: version bump 4.2.6 -> 4.2.6p5 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Feb 26, 2014 at 08:07:05AM +0100, Bruno Thomsen wrote: > Version 4.2.6p5 is the latest stable release. > Fixed install ntpq option. > > Signed-off-by: Bruno Thomsen Thanks, applied. Michael > --- > patches/ntp-4.2.6/Fix-undefined-MOD_NANO.patch | 42 ---------------------- > patches/ntp-4.2.6/series | 1 - > patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch | 42 ++++++++++++++++++++++ > patches/ntp-4.2.6p5/series | 1 + > rules/ntp.make | 6 ++-- > 5 files changed, 46 insertions(+), 46 deletions(-) > delete mode 100644 patches/ntp-4.2.6/Fix-undefined-MOD_NANO.patch > delete mode 100644 patches/ntp-4.2.6/series > create mode 100644 patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch > create mode 100644 patches/ntp-4.2.6p5/series > > diff --git a/patches/ntp-4.2.6/Fix-undefined-MOD_NANO.patch b/patches/ntp-4.2.6/Fix-undefined-MOD_NANO.patch > deleted file mode 100644 > index f4200cf..0000000 > --- a/patches/ntp-4.2.6/Fix-undefined-MOD_NANO.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001 > -From: Alexander Stein > -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 > -Signed-off-by: Marc Kleine-Budde > - > ---- > -#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.6/series b/patches/ntp-4.2.6/series > deleted file mode 100644 > index 6a7679c..0000000 > --- a/patches/ntp-4.2.6/series > +++ /dev/null > @@ -1 +0,0 @@ > -Fix-undefined-MOD_NANO.patch > diff --git a/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch b/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch > new file mode 100644 > index 0000000..f4200cf > --- /dev/null > +++ b/patches/ntp-4.2.6p5/Fix-undefined-MOD_NANO.patch > @@ -0,0 +1,42 @@ > +From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001 > +From: Alexander Stein > +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 > +Signed-off-by: Marc Kleine-Budde > + > +--- > +#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 > new file mode 100644 > index 0000000..6a7679c > --- /dev/null > +++ b/patches/ntp-4.2.6p5/series > @@ -0,0 +1 @@ > +Fix-undefined-MOD_NANO.patch > diff --git a/rules/ntp.make b/rules/ntp.make > index 84d48c1..ba06543 100644 > --- a/rules/ntp.make > +++ b/rules/ntp.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NTP) += ntp > # > # Paths and names > # > -NTP_VERSION := 4.2.6 > -NTP_MD5 := 4d64a99592b818aa9419fc9dcb149746 > +NTP_VERSION := 4.2.6p5 > +NTP_MD5 := 00df80a84ec9528fcfb09498075525bc > 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) > @@ -355,7 +355,7 @@ endif > # # > ifdef PTXCONF_NTP_NTPQ > @$(call install_copy, ntp, 0, 0, 0755, -, \ > - /usr/bin/ntpq) > + /usr/sbin/ntpq) > endif > > # # > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de