ChangeLog, README.cvs, ntp_loopfilter.c:

  * README.cvs: More updates and cleanup.
  * ntpd/ntp_loopfilter.c (loop_config):
  Check against STA_NANO instead of (NTP_API > 3) to catch kernels
  that were rolled while the spec was evolving.
  From: John.Hay@icomtek.csir.co.za
  * README.cvs: Note that we want to check out NTP into a clean
  subdir.
  Reported by jrd@cc.usu.edu (Joe Doupnik)

bk: 3b15484dXO1ucSQOPVnvTjlGafzeOQ

diff --git a/ChangeLog b/ChangeLog
index aab55a4e10b607971658c3abcf6cc051904e98c8..d6d8f9d80aae677286f6dea6ce662a706a734e25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-05-30  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * README.cvs: More updates and cleanup.
+
+       * ntpd/ntp_loopfilter.c (loop_config): 
+       Check against STA_NANO instead of (NTP_API > 3) to catch kernels
+       that were rolled while the spec was evolving.
+       From: John.Hay@icomtek.csir.co.za
+
+       * README.cvs: Note that we want to check out NTP into a clean
+       subdir.
+       Reported by jrd@cc.usu.edu (Joe Doupnik)
+
 2001-05-27  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: 4.0.99k40

diff --git a/README.cvs b/README.cvs
index 24a8f9a701c7698b5ec57012610dafb92cad2b85..041b84ad2d29be8dbe297b25902324c269389416 100644 (file)
--- a/README.cvs
+++ b/README.cvs
@@ -1,10 +1,11 @@
 To get the NTP distribution via anonymous CVS:
 
-    cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp login
+    % cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp login
 
 the password is: anoncvs
 
-    cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp co ntp
+    % rm -rf ntp
+    % cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp co ntp
 
 after which the "ntp_update" script in the top-level of the tree should
 keep things in synch and properly timestamped.
@@ -35,15 +36,17 @@ There are some mailing lists for the NTP CVS distribution.  For more
 information, send a message to <majordomo@ntp.org> with the word "lists"
 in the body of the message.
 
-If you get NTP via CVS, you will need to build the release using GNU make
+If you get NTP via CVS, you MAY need to build the release using GNU make
 and gcc.
 
 You can then "make dist" to build a release tarball that does not require
 GNU make or gcc.
 
-The reason GNU make and gcc are required is because the repository version
-of NTP does not have the make dependencies built-in.  These dependencies
-are created dynamically, and this dynamic process requires GNU make and gcc.
+The reason GNU make and gcc may be required is because the repository
+version of NTP does not have the make dependencies built-in.  These
+dependencies are created dynamically, and this dynamic process may
+require GNU make and gcc.
 
-I'm told that an upcoming version of automake will not require GNU make or
-gcc for the dependency tracking.
+I'm told that the version of automake we are now using does not require
+GNU make or gcc for the dependency tracking, but I haven't tested this
+yet.

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 7d2747ccbafe0986a762cf044677777eca6a7b19..c8a86cf12b66a497a9bdda129bd441d9dfdc1e3d 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -810,11 +810,11 @@ loop_config(
                 */
                pll_control = 1;
                memset(&ntv, 0, sizeof(ntv));
-#if NTP_API > 3 
+#ifdef STA_NANO
                ntv.modes = MOD_BITS | MOD_NANO;
 #else
                ntv.modes = MOD_BITS;
-#endif /* NTP_API */
+#endif /* STA_NANO */
                ntv.maxerror = MAXDISPERSE;
                ntv.esterror = MAXDISPERSE;
                ntv.status = STA_UNSYNC;
@@ -844,12 +844,12 @@ loop_config(
 #endif /* SIGSYS */
                pll_status = ntv.status;
                if (pll_control) {
-#if NTP_API > 3
+#ifdef STA_NANO
                        if (pll_status & STA_NANO)
                                pll_nano = 1;
                        if (pll_status & STA_CLK)
                                ext_enable = 1;
-#endif /* NTP_API */
+#endif /* STA_NANO */
                        msyslog(LOG_NOTICE,
                           "kernel time discipline status %04x",
                            pll_status);