Skip to contentSkip to conversation

Fixed: ntp: convert to autotargets and bump to 4.2.6p2

PATCH New Martin Banky 2 participants 3 messages Sep 20, 2010 – Sep 21, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fixed: ntp: convert to autotargets and bump to 4.2.6p2

[PATCH 1/1] ntp: convert to autotargets and bump to 4.2.6p2
Missed a slash in m4.mk

#1 lore raw

PATCH 1/1 ntp: convert to autotargets and bump to 4.2.6p2

Also added additional options for ntp and fixed a build issue when IPv6 support is not available.

---
 package/ntp/Config.in                   |   44 +++++++++++
 package/ntp/ntp-4.2.4_p5-adjtimex.patch |   33 --------
 package/ntp/ntp-4.2.4_p5-nano.patch     |   36 ---------
 package/ntp/ntp-4.2.6_p2-adjtimex.patch |   33 ++++++++
 package/ntp/ntp-optional-ipv6.patch     |   24 ------
 package/ntp/ntp.mk                      |  122 +++++++++++++------------------
 6 files changed, 128 insertions(+), 164 deletions(-)
 delete mode 100644 package/ntp/ntp-4.2.4_p5-adjtimex.patch
 delete mode 100644 package/ntp/ntp-4.2.4_p5-nano.patch
 create mode 100644 package/ntp/ntp-4.2.6_p2-adjtimex.patch
 delete mode 100644 package/ntp/ntp-optional-ipv6.patch
package/ntp/Config.in +44 -0
index 6213141..85633ba 100644
@@ -11,3 +11,47 @@ config BR2_PACKAGE_NTP_SNTP
 	depends on BR2_PACKAGE_NTP
 	help
 	  Simple network time protocol program
+	  
+config BR2_PACKAGE_NTP_NTP_KEYGEN
+	bool "ntp-keygen"
+	depends on BR2_PACKAGE_NTP
+	help
+	  Create a NTP host key
+	  
+config BR2_PACKAGE_NTP_NTP_WAIT
+	bool "ntp-wait"
+	select BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_NTP
+	help
+	  ntp-wait waits until the locally running ntpd is in state 4
+	  (synchronized). This could be useful at boot time, to delay the
+	  boot sequence until after "ntpd -g" has set the time.
+	  
+config BR2_PACKAGE_NTP_NTPDC
+	bool "ntpdc"
+	depends on BR2_PACKAGE_NTP
+	help
+	  The ntpdc utility program is used to query an NTP daemon about
+	  its current state and to request changes in that state.
+	  
+config BR2_PACKAGE_NTP_NTPQ
+	bool "ntpq"
+	depends on BR2_PACKAGE_NTP
+	help
+	  The ntpq utility program is used to query NTP servers requesting
+	  information about current state and/or changes in that state.
+	  
+config BR2_PACKAGE_NTP_NTPTRACE
+	bool "ntptrace"
+	select BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_NTP
+	help
+	  ntptrace is a perl script that uses the ntpq utility program to
+	  follow the chain of NTP servers from a given host back to the
+	  primary time source
+	  
+config BR2_PACKAGE_NTP_TICKADJ
+	bool "tickadj"
+	depends on BR2_PACKAGE_NTP
+	help
+	  set time-related kernel variables
package/ntp/ntp-4.2.4_p5-adjtimex.patch deleted +0 -33
deleted file mode 100644
index 40625fa..0000000
@@ -1,33 +0,0 @@
-https://support.ntp.org/bugs/show_bug.cgi?id=769
-http://bugs.gentoo.org/254030
-
---- ntp/util/tickadj.c
-+++ ntp/util/tickadj.c
-@@ -21,7 +21,8 @@
- # include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
--#ifdef HAVE___ADJTIMEX		/* Linux */
-+/* proper handling here has been moved to upstream ntp bugzilla */
-+#ifdef linux
- 
- #include <sys/timex.h>
- struct timex txc;
-@@ -91,7 +92,7 @@
- 	}
- 
- 	if (!errflg) {
--		if (__adjtimex(&txc) < 0)
-+		if (adjtimex(&txc) < 0)
- 			perror("adjtimex");
- 		else if (!quiet)
- 			printf("tick     = %ld\ntick_adj = %d\n",
-@@ -146,7 +147,7 @@
- #endif
- 	}
-     
--	if (__adjtimex(&txc) < 0)
-+	if (adjtimex(&txc) < 0)
- 	{
- 		perror("adjtimex");
- 	}
package/ntp/ntp-4.2.4_p5-nano.patch deleted +0 -36
deleted file mode 100644
index f4097ee..0000000
@@ -1,36 +0,0 @@
-Fixes the MOD_NANO build failure
-
-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)
-
-Taken from
-http://cvs.fedoraproject.org/viewvc/devel/ntp/ntp-4.2.4p7-nano.patch?revision=1.1&content-type=text/plain&view=co
-
-See the discussion at
-https://bugs.launchpad.net/ubuntu/+source/ntp/+bug/412242 for more
-details and links. The below fix is not a correct fix, but only a
-workaround. The real fix required changes to kernel/libc headers.
-
-Index: ntp-4.2.4p5/include/ntp_syscall.h
-===================================================================
---- ntp-4.2.4p5.orig/include/ntp_syscall.h	2010-05-14 17:34:48.000000000 +0200
-+++ ntp-4.2.4p5/include/ntp_syscall.h	2010-05-14 17:35:13.000000000 +0200
-@@ -14,6 +14,14 @@
- # include <sys/timex.h>
- #endif
- 
-+#if defined(ADJ_NANO) && !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) && !defined(MOD_TAI)
-+#define MOD_TAI ADJ_TAI
-+#endif
-+
- #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD
- # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))
package/ntp/ntp-4.2.6_p2-adjtimex.patch new file +33 -0
new file mode 100644
index 0000000..40625fa
@@ -0,0 +1,33 @@
+https://support.ntp.org/bugs/show_bug.cgi?id=769
+http://bugs.gentoo.org/254030
+
+--- ntp/util/tickadj.c
++++ ntp/util/tickadj.c
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+ 
+-#ifdef HAVE___ADJTIMEX		/* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+ 
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ 	}
+ 
+ 	if (!errflg) {
+-		if (__adjtimex(&txc) < 0)
++		if (adjtimex(&txc) < 0)
+ 			perror("adjtimex");
+ 		else if (!quiet)
+ 			printf("tick     = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ 	}
+     
+-	if (__adjtimex(&txc) < 0)
++	if (adjtimex(&txc) < 0)
+ 	{
+ 		perror("adjtimex");
+ 	}
package/ntp/ntp-optional-ipv6.patch deleted +0 -24
deleted file mode 100644
index 20d6edf..0000000
@@ -1,24 +0,0 @@
-[PATCH] ntpd: fix build without ipv6 support
-
-ntp_io.c was checkin the non-existing DISABLE_IPV6 define rather
-than WANT_IPV6 as defined in config.h, breaking the build if
-the toolchain doesn't have ipv6 support.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- ntpd/ntp_io.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ntp-4.2.4p5/ntpd/ntp_io.c
-===================================================================
---- ntp-4.2.4p5.orig/ntpd/ntp_io.c
-+++ ntp-4.2.4p5/ntpd/ntp_io.c
-@@ -55,7 +55,7 @@
-  * Set up some macros to look for IPv6 and IPv6 multicast
-  */
- 
--#if defined(ISC_PLATFORM_HAVEIPV6) && !defined(DISABLE_IPV6)
-+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
- 
- #define INCLUDE_IPV6_SUPPORT
- 
package/ntp/ntp.mk +51 -71

142 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 1/1 ntp: convert to autotargets and bump to 4.2.6p2

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Also added additional options for ntp and fixed a build issue Martin> when IPv6 support is not available.

Thanks, committed with minor changes.

Signature · 1 line
Bye, Peter Korsgaard