Skip to contentSkip to conversation

ntp updates

PATCH Superseded Morgan Little 3 participants 9 messages Oct 19, 2012 – Oct 23, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ntp updates

The following changes since commit a660f4a0289884f516ed85a75a25c722e31e88c9:
Paul Eggleton (1):
modphp: make LICENSE more accurate

are available in the git repository at:

[email protected]:morganlittle/meta-oe.git ntp

Morgan Little (3):
ntp: Move from meta-oe to meta-networking
ntp: Uprev from 4.2.6p3 to 4.2.6p5
ntp: Clean up recipes

 .../recipes-support/ntp/files/ntp                  |    0
 .../ntp/files/ntp-4.2.4_p6-nano.patch              |    0
 .../recipes-support/ntp/files/ntp.conf             |    0
 .../recipes-support/ntp/files/ntpd                 |    0
 .../recipes-support/ntp/files/ntpdate              |    0
 .../recipes-support/ntp/files/tickadj.c.patch      |    0
 .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   12 +++
 meta-networking/recipes-support/ntp/ntp.inc        |   72 ++++++++++++++++++++
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |    6 ++
 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb     |   11 ---
 meta-oe/recipes-support/ntp/ntp.inc                |   35 ----------
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   47 -------------
 12 files changed, 90 insertions(+), 93 deletions(-)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp.conf (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntpd (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntpdate (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/tickadj.c.patch (100%)
 create mode 100644 meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
 create mode 100644 meta-networking/recipes-support/ntp/ntp.inc
 create mode 100644 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
 delete mode 100644 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
 delete mode 100644 meta-oe/recipes-support/ntp/ntp.inc
 delete mode 100644 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
#1 lore raw

PATCH 1/3 ntp: Move from meta-oe to meta-networking

---
 meta-networking/recipes-support/ntp/files/ntp      |   31 ++++++++++
 .../ntp/files/ntp-4.2.4_p6-nano.patch              |   17 +++++
 meta-networking/recipes-support/ntp/files/ntp.conf |   14 +++++
 meta-networking/recipes-support/ntp/files/ntpd     |   62 ++++++++++++++++++++
 meta-networking/recipes-support/ntp/files/ntpdate  |   49 +++++++++++++++
 .../recipes-support/ntp/files/tickadj.c.patch      |   32 ++++++++++
 .../recipes-support/ntp/ntp-ssl_4.2.6p3.bb         |   11 ++++
 meta-networking/recipes-support/ntp/ntp.inc        |   35 +++++++++++
 meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb |   47 +++++++++++++++
 meta-oe/recipes-support/ntp/files/ntp              |   31 ----------
 .../ntp/files/ntp-4.2.4_p6-nano.patch              |   17 -----
 meta-oe/recipes-support/ntp/files/ntp.conf         |   14 -----
 meta-oe/recipes-support/ntp/files/ntpd             |   62 --------------------
 meta-oe/recipes-support/ntp/files/ntpdate          |   49 ---------------
 meta-oe/recipes-support/ntp/files/tickadj.c.patch  |   32 ----------
 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb     |   11 ----
 meta-oe/recipes-support/ntp/ntp.inc                |   35 -----------
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   47 ---------------
 18 files changed, 298 insertions(+), 298 deletions(-)
 create mode 100755 meta-networking/recipes-support/ntp/files/ntp
 create mode 100644 meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
 create mode 100644 meta-networking/recipes-support/ntp/files/ntp.conf
 create mode 100755 meta-networking/recipes-support/ntp/files/ntpd
 create mode 100755 meta-networking/recipes-support/ntp/files/ntpdate
 create mode 100644 meta-networking/recipes-support/ntp/files/tickadj.c.patch
 create mode 100644 meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
 create mode 100644 meta-networking/recipes-support/ntp/ntp.inc
 create mode 100644 meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
 delete mode 100755 meta-oe/recipes-support/ntp/files/ntp
 delete mode 100644 meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
 delete mode 100644 meta-oe/recipes-support/ntp/files/ntp.conf
 delete mode 100755 meta-oe/recipes-support/ntp/files/ntpd
 delete mode 100755 meta-oe/recipes-support/ntp/files/ntpdate
 delete mode 100644 meta-oe/recipes-support/ntp/files/tickadj.c.patch
 delete mode 100644 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
 delete mode 100644 meta-oe/recipes-support/ntp/ntp.inc
 delete mode 100644 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
meta-networking/recipes-support/ntp/files/ntp new file +31 -0
new file mode 100755
index 0000000..e91a528
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+FLAGS="defaults 23"
+
+test -f /usr/bin/ntpd || exit 0
+
+case "$1" in
+	start)
+		echo -n "Starting NTP server: ntpd"
+  		start-stop-daemon --start --quiet --exec /usr/bin/ntpd
+		echo "."
+  		;;
+	stop)
+		echo -n "Stopping NTP server: ntpd"
+  		start-stop-daemon --stop --quiet --exec /usr/bin/ntpd
+		echo "."
+  		;;
+	restart|force-reload)
+		echo -n "Restarting NTP server: ntpd... "
+  		start-stop-daemon --stop --quiet --exec /usr/bin/ntpd
+  		sleep 2
+  		start-stop-daemon --start --quiet --exec /usr/bin/ntpd
+		echo "done."
+  		;;
+	*)
+  		echo "Usage: /etc/init.d/ntp {start|stop|restart|force-reload}"
+  		exit 1
+		;;
+esac
+
+exit 0
meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch new file +17 -0
new file mode 100644
index 0000000..cb1e2f7
@@ -0,0 +1,17 @@
+--- a/include/ntp_syscall.h.orig	2009-05-19 16:44:55.048156467 -0400
++++ b/include/ntp_syscall.h	2009-05-19 16:46:19.293323686 -0400
+@@ -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))
meta-networking/recipes-support/ntp/files/ntp.conf new file +14 -0
new file mode 100644
index 0000000..bf52440
@@ -0,0 +1,14 @@
+# This is the most basic ntp configuration file
+# The driftfile must remain in a place specific to this
+# machine - it records the machine specific clock error
+driftfile /etc/ntp.drift
+# This obtains a random server which will be close
+# (in IP terms) to the machine.  Add other servers
+# as required, or change this.
+server pool.ntp.org
+# Using local hardware clock as fallback
+# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
+server 127.127.1.0
+fudge 127.127.1.0 stratum 14
+# Defining a default security setting
+restrict default
meta-networking/recipes-support/ntp/files/ntpd new file +62 -0

62 lines not on this page · raw message

meta-networking/recipes-support/ntp/files/ntpdate new file +49 -0

49 lines not on this page · raw message

meta-networking/recipes-support/ntp/files/tickadj.c.patch new file +32 -0
new file mode 100644
index 0000000..9ef9de9
@@ -0,0 +1,32 @@
+Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
+===================================================================
+--- ntp-4.2.2p3/util/tickadj.c	2004-02-25 06:58:33.000000000 +0100
++++ ntp-4.2.2p3/util/tickadj.c	2007-07-07 01:00:54.000000000 +0200
+@@ -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");
+ 	}
meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb new file +11 -0
new file mode 100644
index 0000000..a158990
@@ -0,0 +1,11 @@
+require ntp_${PV}.bb
+DEPENDS = "openssl"
+
+S = "${WORKDIR}/ntp-${PV}"
+
+EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
+	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
+
+
+SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
+SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
meta-networking/recipes-support/ntp/ntp.inc new file +35 -0
new file mode 100644
index 0000000..1d740f0
@@ -0,0 +1,35 @@
+DESCRIPTION = "The Network Time Protocol (NTP) is used to \
+synchronize the time of a computer client or server to \
+another server or reference time source, such as a radio \
+or satellite receiver or modem."
+HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
+SECTION = "console/network"
+LICENSE = "ntp"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
+RSUGGESTS_${PN} = "iana-etc"
+
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
+	file://ipv6only-workaround.patch \
+	file://ntpd \
+	file://ntp.conf \
+	file://ntpdate \
+	file://ntpd.service \
+"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "ntpd"
+# No dependencies, so just go in at the standard level (20)
+INITSCRIPT_PARAMS = "defaults"
+
+# The ac_cv_header_readline_history is to stop ntpdc depending on either
+# readline or curses
+EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
+CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+
+PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils"
+# NOTE: you don't need ntpdate, use "ntpd -q -g -x"
+# or the ntpdate systemd service
+
+# This should use rc.update
+FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb new file +47 -0

47 lines not on this page · raw message

meta-oe/recipes-support/ntp/files/ntp deleted +0 -31
deleted file mode 100755
index e91a528..0000000
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-FLAGS="defaults 23"
-
-test -f /usr/bin/ntpd || exit 0
-
-case "$1" in
-	start)
-		echo -n "Starting NTP server: ntpd"
-  		start-stop-daemon --start --quiet --exec /usr/bin/ntpd
-		echo "."
-  		;;
-	stop)
-		echo -n "Stopping NTP server: ntpd"
-  		start-stop-daemon --stop --quiet --exec /usr/bin/ntpd
-		echo "."
-  		;;
-	restart|force-reload)
-		echo -n "Restarting NTP server: ntpd... "
-  		start-stop-daemon --stop --quiet --exec /usr/bin/ntpd
-  		sleep 2
-  		start-stop-daemon --start --quiet --exec /usr/bin/ntpd
-		echo "done."
-  		;;
-	*)
-  		echo "Usage: /etc/init.d/ntp {start|stop|restart|force-reload}"
-  		exit 1
-		;;
-esac
-
-exit 0
meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch deleted +0 -17
deleted file mode 100644
index cb1e2f7..0000000
@@ -1,17 +0,0 @@
---- a/include/ntp_syscall.h.orig	2009-05-19 16:44:55.048156467 -0400
-+++ b/include/ntp_syscall.h	2009-05-19 16:46:19.293323686 -0400
-@@ -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))
meta-oe/recipes-support/ntp/files/ntp.conf deleted +0 -14
deleted file mode 100644
index bf52440..0000000
@@ -1,14 +0,0 @@
-# This is the most basic ntp configuration file
-# The driftfile must remain in a place specific to this
-# machine - it records the machine specific clock error
-driftfile /etc/ntp.drift
-# This obtains a random server which will be close
-# (in IP terms) to the machine.  Add other servers
-# as required, or change this.
-server pool.ntp.org
-# Using local hardware clock as fallback
-# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
-server 127.127.1.0
-fudge 127.127.1.0 stratum 14
-# Defining a default security setting
-restrict default
meta-oe/recipes-support/ntp/files/ntpd deleted +0 -62

62 lines not on this page · raw message

meta-oe/recipes-support/ntp/files/ntpdate deleted +0 -49

49 lines not on this page · raw message

meta-oe/recipes-support/ntp/files/tickadj.c.patch deleted +0 -32
deleted file mode 100644
index 9ef9de9..0000000
@@ -1,32 +0,0 @@
-Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
-===================================================================
---- ntp-4.2.2p3/util/tickadj.c	2004-02-25 06:58:33.000000000 +0100
-+++ ntp-4.2.2p3/util/tickadj.c	2007-07-07 01:00:54.000000000 +0200
-@@ -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");
- 	}
meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb deleted +0 -11
deleted file mode 100644
index a158990..0000000
@@ -1,11 +0,0 @@
-require ntp_${PV}.bb
-DEPENDS = "openssl"
-
-S = "${WORKDIR}/ntp-${PV}"
-
-EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
-	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
-
-
-SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
-SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
meta-oe/recipes-support/ntp/ntp.inc deleted +0 -35
deleted file mode 100644
index 1d740f0..0000000
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Network Time Protocol (NTP) is used to \
-synchronize the time of a computer client or server to \
-another server or reference time source, such as a radio \
-or satellite receiver or modem."
-HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
-SECTION = "console/network"
-LICENSE = "ntp"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
-RSUGGESTS_${PN} = "iana-etc"
-
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-	file://ipv6only-workaround.patch \
-	file://ntpd \
-	file://ntp.conf \
-	file://ntpdate \
-	file://ntpd.service \
-"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "ntpd"
-# No dependencies, so just go in at the standard level (20)
-INITSCRIPT_PARAMS = "defaults"
-
-# The ac_cv_header_readline_history is to stop ntpdc depending on either
-# readline or curses
-EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
-CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-
-PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils"
-# NOTE: you don't need ntpdate, use "ntpd -q -g -x"
-# or the ntpdate systemd service
-
-# This should use rc.update
-FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb deleted +0 -47

47 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 2/3 ntp: Uprev from 4.2.6p3 to 4.2.6p5

In reply to Morgan Little
---
 .../recipes-support/ntp/ntp-ssl_4.2.6p3.bb         |   11 -----
 .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   11 +++++
 meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb |   47 --------------------
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |   47 ++++++++++++++++++++
 4 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
 create mode 100644 meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
 delete mode 100644 meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
 create mode 100644 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb deleted +0 -11
deleted file mode 100644
index a158990..0000000
@@ -1,11 +0,0 @@
-require ntp_${PV}.bb
-DEPENDS = "openssl"
-
-S = "${WORKDIR}/ntp-${PV}"
-
-EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
-	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
-
-
-SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95"
-SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a"
meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb new file +11 -0
new file mode 100644
index 0000000..201b272
@@ -0,0 +1,11 @@
+require ntp_${PV}.bb
+DEPENDS = "openssl"
+
+S = "${WORKDIR}/ntp-${PV}"
+
+EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
+	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
+
+
+SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
+SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb deleted +0 -47

47 lines not on this page · raw message

meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#5 lore raw

Re: [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5

In reply to Morgan Little

meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb line 3

Quoted 5 lines · Morgan Little

+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb

meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb new file +3 -0
@@ -0,0 +1,47 @@
+require ntp.inc
+
+PR = "r0"

Don't use PR for r0.

Noticed it when checking patch 3/3.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#6 lore raw

PATCH 3/3 ntp: Clean up recipes

In reply to Morgan Little

Clean up recipes to make them easier to read and to allow ntp-ssl to build
* Move common portions to ntp.inc
* Update ntp-ssl to require ntp.inc oppose to ntp_4.2.6
* Change ntp-ssl EXTRA_OECONF to append so it won't try to configure snmp as
it will use local paths and cause a error while configuring

---
 .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   13 +++---
 meta-networking/recipes-support/ntp/ntp.inc        |   47 +++++++++++++++++--
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |   43 +-----------------
 3 files changed, 50 insertions(+), 53 deletions(-)
meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb +7 -6
index 201b272..d45945a 100644
@@ -1,11 +1,12 @@
-require ntp_${PV}.bb
+require ntp.inc
 DEPENDS = "openssl"
 
-S = "${WORKDIR}/ntp-${PV}"
+PR = "r0"
 
-EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
-	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
+S = "${WORKDIR}/ntp-${PV}"
 
+EXTRA_OECONF += "--with-openssl-libdir=${STAGING_LIBDIR} \
+		 --with-openssl-incdir=${STAGING_INCDIR}/openssl \
+		 --with-crypto"
 
-SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
-SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
+FILES_${PN} += "${bindir}/sntp ${bindir}/ntp-keygen"
meta-networking/recipes-support/ntp/ntp.inc +42 -5

68 lines not on this page · raw message

meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb +1 -42

47 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#7 lore raw

Re: [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes

meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb line 4

Quoted 8 lines · Morgan Little

+++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb

meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb +2 -2
@@ -1,11 +1,12 @@
-require ntp_${PV}.bb
+require ntp.inc
 DEPENDS = "openssl"
 
-S = "${WORKDIR}/ntp-${PV}"
+PR = "r0"

As you are using an .inc file, please use INC_PR.

Quoted 19 lines
meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb +5 -4
-EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
-               --with-openssl-incdir=${STAGING_INCDIR}/openssl"
+S = "${WORKDIR}/ntp-${PV}"
 
+EXTRA_OECONF += "--with-openssl-libdir=${STAGING_LIBDIR} \
+                --with-openssl-incdir=${STAGING_INCDIR}/openssl \
+                --with-crypto"
 
-SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
-SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
+FILES_${PN} += "${bindir}/sntp ${bindir}/ntp-keygen"
meta-networking/recipes-support/ntp/ntp.inc +0 -0
index 1d740f0..20b9060 100644
@@ -8,14 +8,17 @@ LICENSE = "ntp"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
 RSUGGESTS_${PN} = "iana-etc"
 

meta-networking/recipes-support/ntp/ntp.inc LICENSE = "ntp" · line 17

Quoted 10 lines
meta-networking/recipes-support/ntp/ntp.inc +3 -3
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-       file://ipv6only-workaround.patch \
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
+       file://tickadj.c.patch \
+       file://ntp-4.2.4_p6-nano.patch \
        file://ntpd \
        file://ntp.conf \
        file://ntpdate \
-       file://ntpd.service \
 "

Use INC_PR.

Quoted 60 lines
meta-networking/recipes-support/ntp/ntp.inc +39 -2
+SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
+SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
+
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "ntpd"
@@ -24,12 +27,46 @@ INITSCRIPT_PARAMS = "defaults"
 
 # The ac_cv_header_readline_history is to stop ntpdc depending on either
 # readline or curses
-EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
+EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd ac_cv_header_readline_history_h=no"
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
-PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils"
+do_configure(){
+       oe_runconf
+}
+
+do_install_append() {
+       install -d ${D}/${sysconfdir}/init.d
+       install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
+       install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
+       install -d ${D}/${sysconfdir}/network/if-up.d
+       install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
+}
+
+FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
+FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}"
+FILES_${PN}-tickadj = "${bindir}/tickadj"
+FILES_${PN}-utils = "${bindir}/*"
+FILES_${PN}-date += "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
+
+# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
+# with wonky clocks (e.g. OpenSlug)
+RDEPENDS_${PN} = "${PN}-tickadj"
+
+PACKAGES += "${PN}-date ${PN}-bin ${PN}-tickadj ${PN}-utils"
 # NOTE: you don't need ntpdate, use "ntpd -q -g -x"
 # or the ntpdate systemd service
 
 # This should use rc.update
 FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
+
+pkg_postinst_ntpdate() {
+if test "x$D" != "x"; then
+        exit 1
+else
+        if ! grep -q -s ntpdate /var/spool/cron/root; then
+                echo "adding crontab"
+                test -d /var/spool/cron || mkdir -p /var/spool/cron
+                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
+        fi
+fi
+}
meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb +0 -0
index c542873..9c677c3 100644

meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb require ntp.inc · line 3

Quoted 2 lines
meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb +0 -0
@@ -2,46 +2,5 @@ require ntp.inc
 
 PR = "r0"

INC_PR please.

If this didn't use an .inc file, avoid putting PR for r0.

Quoted 52 lines
meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb +1 -43
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
-        file://tickadj.c.patch \
-        file://ntp-4.2.4_p6-nano.patch \
-        file://ntpd \
-        file://ntp.conf \
-        file://ntpdate \
-"
-
-SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
-SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
-
-EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd"
-
-do_install_append() {
-       install -d ${D}/${sysconfdir}/init.d
-       install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
-       install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
-       install -d ${D}/${sysconfdir}/network/if-up.d
-       install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
-}
-
-FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
-FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
-FILES_${PN}-tickadj = "${bindir}/tickadj"
-FILES_ntp-utils = "${bindir}/*"
-FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate"
-
-# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
-# with wonky clocks (e.g. OpenSlug)
-RDEPENDS_${PN} = "${PN}-tickadj"
-
-pkg_postinst_ntpdate() {
-if test "x$D" != "x"; then
-        exit 1
-else
-        if ! grep -q -s ntpdate /var/spool/cron/root; then
-                echo "adding crontab"
-                test -d /var/spool/cron || mkdir -p /var/spool/cron
-                echo "30 * * * *    /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root
-        fi
-fi
-}
+EXTRA_OECONF += "--without-openssl --without-crypto"
 
--

1.7.0.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#8 lore raw
In reply to Morgan Little

Hey Morgan,

Can you send out an updated set of patches based on the feedback you've received so far? I only saw Otavio's suggestions, I think, but if you've got anything else, please address them as well.

I'm fine with the patch set with Otavio's suggested changes integrated.

-J.

Quoted 43 lines · [[oe] [meta-oe][meta-networking][PATCH 0/3] ntp updates] On 12.10.19 (Fri…

The following changes since commit a660f4a0289884f516ed85a75a25c722e31e88c9:
Paul Eggleton (1):
modphp: make LICENSE more accurate

are available in the git repository at:

[email protected]:morganlittle/meta-oe.git ntp

Morgan Little (3):
ntp: Move from meta-oe to meta-networking
ntp: Uprev from 4.2.6p3 to 4.2.6p5
ntp: Clean up recipes

 .../recipes-support/ntp/files/ntp                  |    0
 .../ntp/files/ntp-4.2.4_p6-nano.patch              |    0
 .../recipes-support/ntp/files/ntp.conf             |    0
 .../recipes-support/ntp/files/ntpd                 |    0
 .../recipes-support/ntp/files/ntpdate              |    0
 .../recipes-support/ntp/files/tickadj.c.patch      |    0
 .../recipes-support/ntp/ntp-ssl_4.2.6p5.bb         |   12 +++
 meta-networking/recipes-support/ntp/ntp.inc        |   72 ++++++++++++++++++++
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |    6 ++
 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb     |   11 ---
 meta-oe/recipes-support/ntp/ntp.inc                |   35 ----------
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   47 -------------
 12 files changed, 90 insertions(+), 93 deletions(-)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntp.conf (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntpd (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/ntpdate (100%)
 rename {meta-oe => meta-networking}/recipes-support/ntp/files/tickadj.c.patch (100%)
 create mode 100644 meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
 create mode 100644 meta-networking/recipes-support/ntp/ntp.inc
 create mode 100644 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
 delete mode 100644 meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
 delete mode 100644 meta-oe/recipes-support/ntp/ntp.inc
 delete mode 100644 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 2 lines
Joe MacDonald, Sr. Member of Technical Staff, Linux Products Group, Wind River
direct 613.270.5750     mobile 613.291.7421     fax 613.592.2283