Signed-off-by: Denis Osterland <denis.osterl...@diehl.com> --- patches/ntp-4.2.8p8/Fix-undefined-MOD_NANO.patch | 42 ------------------------ patches/ntp-4.2.8p8/series | 1 - rules/ntp.make | 6 ++-- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 patches/ntp-4.2.8p8/Fix-undefined-MOD_NANO.patch delete mode 100644 patches/ntp-4.2.8p8/series
diff --git a/patches/ntp-4.2.8p8/Fix-undefined-MOD_NANO.patch b/patches/ntp-4.2.8p8/Fix-undefined-MOD_NANO.patch deleted file mode 100644 index f4200cf..0000000 --- a/patches/ntp-4.2.8p8/Fix-undefined-MOD_NANO.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001 -From: Alexander Stein <alexander.st...@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.st...@systec-electronic.com> -Signed-off-by: Marc Kleine-Budde <m...@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.8p8/series b/patches/ntp-4.2.8p8/series deleted file mode 100644 index 6a7679c..0000000 --- a/patches/ntp-4.2.8p8/series +++ /dev/null @@ -1 +0,0 @@ -Fix-undefined-MOD_NANO.patch diff --git a/rules/ntp.make b/rules/ntp.make index d00c193..67405c4 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -17,15 +17,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp # # Paths and names # -NTP_VERSION := 4.2.8p8 -NTP_MD5 := 4a8636260435b230636f053ffd070e34 +NTP_VERSION := 4.2.8p10 +NTP_MD5 := 745384ed0dedb3f66b33fe84d66466f9 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) NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX) NTP_DIR := $(BUILDDIR)/$(NTP) NTP_LICENSE := ntp -NTP_LICENSE_FILES := file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa +NTP_LICENSE_FILES := file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003 # ---------------------------------------------------------------------------- # Prepare -- 2.7.4 Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied) Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 – Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de