[meta-oe][meta-networking][PATCH 0/3] ntp updates

Openembedded Devel Discussions
 help / color / mirror / Atom feed

* [meta-oe][meta-networking][PATCH 0/3] ntp updates
@ 2012-10-19 20:38 Morgan Little
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking Morgan Little
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Morgan Little @ 2012-10-19 20:38 UTC (permalink / raw)
  To: openembedded-devel

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

are available in the git repository at:

  git@github.com: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



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking
  2012-10-19 20:38 [meta-oe][meta-networking][PATCH 0/3] ntp updates Morgan Little
@ 2012-10-19 20:38 ` Morgan Little
  2012-10-20 11:43   ` Otavio Salvador
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5 Morgan Little
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Morgan Little @ 2012-10-19 20:38 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 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

diff --git a/meta-networking/recipes-support/ntp/files/ntp b/meta-networking/recipes-support/ntp/files/ntp
new file mode 100755
index 0000000..e91a528
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntp
@@ -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
diff --git a/meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
new file mode 100644
index 0000000..cb1e2f7
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
@@ -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))
diff --git a/meta-networking/recipes-support/ntp/files/ntp.conf b/meta-networking/recipes-support/ntp/files/ntp.conf
new file mode 100644
index 0000000..bf52440
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntp.conf
@@ -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
diff --git a/meta-networking/recipes-support/ntp/files/ntpd b/meta-networking/recipes-support/ntp/files/ntpd
new file mode 100755
index 0000000..ae50f13
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntpd
@@ -0,0 +1,62 @@
+#! /bin/sh
+#
+# ntpd	init.d script for ntpdc from ntp.isc.org
+test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
+# rcS contains TICKADJ
+test -r /etc/default/rcS && . /etc/default/rcS
+
+# Functions to do individual actions
+settick(){
+  	# If TICKADJ is set we *must* adjust it before we start, because the
+	# driftfile relies on the correct setting
+	test -n "$TICKADJ" -a -x /usr/bin/tickadj && {
+		echo -n "Setting tick to $TICKADJ: "
+		/usr/bin/tickadj "$TICKADJ"
+		echo "done"
+	}
+}
+startdaemon(){
+	# The -g option allows ntpd to step the time to correct it just
+	# once.  The daemon will exit if the clock drifts too much after
+	# this.  If ntpd seems to disappear after a while assume TICKADJ
+	# above is set to a totally incorrect value.
+	echo -n "Starting ntpd: "
+	start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@"
+	echo "done"
+}
+stopdaemon(){
+	echo -n "Stopping ntpd: "
+	start-stop-daemon --stop -p /var/run/ntp.pid
+	echo "done"
+}
+
+case "$1" in
+  start)
+  	settick
+	startdaemon -g
+	;;
+  stop)
+  	stopdaemon
+	;;
+  force-reload)
+  	stopdaemon
+  	settick
+	startdaemon -g
+	;;
+  restart)
+  	# Don't reset the tick here
+	stopdaemon
+	startdaemon -g
+	;;
+  reload)
+  	# Must do this by hand, but don't do -g
+	stopdaemon
+	startdaemon
+	;;
+  *)
+	echo "Usage: ntpd { start | stop | restart | reload }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-networking/recipes-support/ntp/files/ntpdate b/meta-networking/recipes-support/ntp/files/ntpdate
new file mode 100755
index 0000000..784b029
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntpdate
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/bin
+
+test -x /usr/bin/ntpdate || exit 0
+
+if test -f /etc/default/ntpdate ; then
+. /etc/default/ntpdate
+else
+NTPSERVERS="pool.ntp.org"
+fi
+
+test -n "$NTPSERVERS" || exit 0
+
+# This is a heuristic:  The idea is that if a static interface is brought
+# up, that is a major event, and we can put in some extra effort to fix
+# the system time.  Feel free to change this, especially if you regularly
+# bring up new network interfaces.
+if [ "$METHOD" = static ]; then
+	OPTS="-b"
+fi
+
+if [ "$METHOD" = loopback ]; then
+	exit 0
+fi
+
+(
+
+LOCKFILE=/var/lock/ntpdate
+
+# Avoid running more than one at a time
+if [ -x /usr/bin/lockfile-create ]; then
+	lockfile-create $LOCKFILE
+	lockfile-touch $LOCKFILE &
+	LOCKTOUCHPID="$!"
+fi
+
+if /usr/bin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then
+	if [ "$UPDATE_HWCLOCK" = "yes" ]; then
+		hwclock --systohc || :
+	fi
+fi
+
+if [ -x /usr/bin/lockfile-create ] ; then
+	kill $LOCKTOUCHPID
+	lockfile-remove $LOCKFILE
+fi
+
+) &
diff --git a/meta-networking/recipes-support/ntp/files/tickadj.c.patch b/meta-networking/recipes-support/ntp/files/tickadj.c.patch
new file mode 100644
index 0000000..9ef9de9
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/tickadj.c.patch
@@ -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");
+ 	}
diff --git a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
new file mode 100644
index 0000000..a158990
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
@@ -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"
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
new file mode 100644
index 0000000..1d740f0
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -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"
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
new file mode 100644
index 0000000..89a272a
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
@@ -0,0 +1,47 @@
+require ntp.inc
+
+PR = "r6"
+
+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] = "59876a9009b098ff59767ee45a88ebd2"
+SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
+
+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
+}
+
diff --git a/meta-oe/recipes-support/ntp/files/ntp b/meta-oe/recipes-support/ntp/files/ntp
deleted file mode 100755
index e91a528..0000000
--- a/meta-oe/recipes-support/ntp/files/ntp
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch b/meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
deleted file mode 100644
index cb1e2f7..0000000
--- a/meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
+++ /dev/null
@@ -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))
diff --git a/meta-oe/recipes-support/ntp/files/ntp.conf b/meta-oe/recipes-support/ntp/files/ntp.conf
deleted file mode 100644
index bf52440..0000000
--- a/meta-oe/recipes-support/ntp/files/ntp.conf
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-support/ntp/files/ntpd b/meta-oe/recipes-support/ntp/files/ntpd
deleted file mode 100755
index ae50f13..0000000
--- a/meta-oe/recipes-support/ntp/files/ntpd
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-#
-# ntpd	init.d script for ntpdc from ntp.isc.org
-test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
-# rcS contains TICKADJ
-test -r /etc/default/rcS && . /etc/default/rcS
-
-# Functions to do individual actions
-settick(){
-  	# If TICKADJ is set we *must* adjust it before we start, because the
-	# driftfile relies on the correct setting
-	test -n "$TICKADJ" -a -x /usr/bin/tickadj && {
-		echo -n "Setting tick to $TICKADJ: "
-		/usr/bin/tickadj "$TICKADJ"
-		echo "done"
-	}
-}
-startdaemon(){
-	# The -g option allows ntpd to step the time to correct it just
-	# once.  The daemon will exit if the clock drifts too much after
-	# this.  If ntpd seems to disappear after a while assume TICKADJ
-	# above is set to a totally incorrect value.
-	echo -n "Starting ntpd: "
-	start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@"
-	echo "done"
-}
-stopdaemon(){
-	echo -n "Stopping ntpd: "
-	start-stop-daemon --stop -p /var/run/ntp.pid
-	echo "done"
-}
-
-case "$1" in
-  start)
-  	settick
-	startdaemon -g
-	;;
-  stop)
-  	stopdaemon
-	;;
-  force-reload)
-  	stopdaemon
-  	settick
-	startdaemon -g
-	;;
-  restart)
-  	# Don't reset the tick here
-	stopdaemon
-	startdaemon -g
-	;;
-  reload)
-  	# Must do this by hand, but don't do -g
-	stopdaemon
-	startdaemon
-	;;
-  *)
-	echo "Usage: ntpd { start | stop | restart | reload }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/meta-oe/recipes-support/ntp/files/ntpdate b/meta-oe/recipes-support/ntp/files/ntpdate
deleted file mode 100755
index 784b029..0000000
--- a/meta-oe/recipes-support/ntp/files/ntpdate
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/bin
-
-test -x /usr/bin/ntpdate || exit 0
-
-if test -f /etc/default/ntpdate ; then
-. /etc/default/ntpdate
-else
-NTPSERVERS="pool.ntp.org"
-fi
-
-test -n "$NTPSERVERS" || exit 0
-
-# This is a heuristic:  The idea is that if a static interface is brought
-# up, that is a major event, and we can put in some extra effort to fix
-# the system time.  Feel free to change this, especially if you regularly
-# bring up new network interfaces.
-if [ "$METHOD" = static ]; then
-	OPTS="-b"
-fi
-
-if [ "$METHOD" = loopback ]; then
-	exit 0
-fi
-
-(
-
-LOCKFILE=/var/lock/ntpdate
-
-# Avoid running more than one at a time
-if [ -x /usr/bin/lockfile-create ]; then
-	lockfile-create $LOCKFILE
-	lockfile-touch $LOCKFILE &
-	LOCKTOUCHPID="$!"
-fi
-
-if /usr/bin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then
-	if [ "$UPDATE_HWCLOCK" = "yes" ]; then
-		hwclock --systohc || :
-	fi
-fi
-
-if [ -x /usr/bin/lockfile-create ] ; then
-	kill $LOCKTOUCHPID
-	lockfile-remove $LOCKFILE
-fi
-
-) &
diff --git a/meta-oe/recipes-support/ntp/files/tickadj.c.patch b/meta-oe/recipes-support/ntp/files/tickadj.c.patch
deleted file mode 100644
index 9ef9de9..0000000
--- a/meta-oe/recipes-support/ntp/files/tickadj.c.patch
+++ /dev/null
@@ -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");
- 	}
diff --git a/meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
deleted file mode 100644
index a158990..0000000
--- a/meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-support/ntp/ntp.inc b/meta-oe/recipes-support/ntp/ntp.inc
deleted file mode 100644
index 1d740f0..0000000
--- a/meta-oe/recipes-support/ntp/ntp.inc
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
deleted file mode 100644
index 89a272a..0000000
--- a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-require ntp.inc
-
-PR = "r6"
-
-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] = "59876a9009b098ff59767ee45a88ebd2"
-SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
-
-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
-}
-
-- 
1.7.0.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking Morgan Little
@ 2012-10-20 11:43   ` Otavio Salvador
  0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2012-10-20 11:43 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Oct 19, 2012 at 5:38 PM, Morgan Little
<morgan.little@windriver.com> wrote:
> Signed-off-by: Morgan Little <morgan.little@windriver.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5
  2012-10-19 20:38 [meta-oe][meta-networking][PATCH 0/3] ntp updates Morgan Little
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking Morgan Little
@ 2012-10-19 20:38 ` Morgan Little
  2012-10-20 11:43   ` Otavio Salvador
  2012-10-20 11:46   ` Otavio Salvador
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes Morgan Little
  2012-10-23 15:28 ` [meta-oe][meta-networking][PATCH 0/3] ntp updates Joe MacDonald
  3 siblings, 2 replies; 9+ messages in thread
From: Morgan Little @ 2012-10-19 20:38 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 .../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

diff --git a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
deleted file mode 100644
index a158990..0000000
--- a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
+++ /dev/null
@@ -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"
diff --git a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
new file mode 100644
index 0000000..201b272
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
@@ -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"
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
deleted file mode 100644
index 89a272a..0000000
--- a/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-require ntp.inc
-
-PR = "r6"
-
-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] = "59876a9009b098ff59767ee45a88ebd2"
-SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e"
-
-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
-}
-
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
new file mode 100644
index 0000000..c542873
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
@@ -0,0 +1,47 @@
+require ntp.inc
+
+PR = "r0"
+
+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
+}
+
-- 
1.7.0.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5 Morgan Little
@ 2012-10-20 11:43   ` Otavio Salvador
  2012-10-20 11:46   ` Otavio Salvador
  1 sibling, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2012-10-20 11:43 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Oct 19, 2012 at 5:38 PM, Morgan Little
<morgan.little@windriver.com> wrote:
> Signed-off-by: Morgan Little <morgan.little@windriver.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5 Morgan Little
  2012-10-20 11:43   ` Otavio Salvador
@ 2012-10-20 11:46   ` Otavio Salvador
  1 sibling, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2012-10-20 11:46 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Oct 19, 2012 at 5:38 PM, Morgan Little
<morgan.little@windriver.com> wrote:
> +++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> @@ -0,0 +1,47 @@
> +require ntp.inc
> +
> +PR = "r0"

Don't use PR for r0.

Noticed it when checking patch 3/3.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes
  2012-10-19 20:38 [meta-oe][meta-networking][PATCH 0/3] ntp updates Morgan Little
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking Morgan Little
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5 Morgan Little
@ 2012-10-19 20:38 ` Morgan Little
  2012-10-20 11:49   ` Otavio Salvador
  2012-10-23 15:28 ` [meta-oe][meta-networking][PATCH 0/3] ntp updates Joe MacDonald
  3 siblings, 1 reply; 9+ messages in thread
From: Morgan Little @ 2012-10-19 20:38 UTC (permalink / raw)
  To: openembedded-devel

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

Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 .../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(-)

diff --git a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
index 201b272..d45945a 100644
--- a/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
@@ -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"
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 1d740f0..20b9060 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -8,14 +8,17 @@ 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 \
+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 \
 "
 
+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
+}
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
index c542873..9c677c3 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
@@ -2,46 +2,5 @@ require ntp.inc
 
 PR = "r0"
 
-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




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes Morgan Little
@ 2012-10-20 11:49   ` Otavio Salvador
  0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2012-10-20 11:49 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Oct 19, 2012 at 5:38 PM, Morgan Little
<morgan.little@windriver.com> wrote:
> +++ b/meta-networking/recipes-support/ntp/ntp-ssl_4.2.6p5.bb
> @@ -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.

> -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"
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index 1d740f0..20b9060 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -8,14 +8,17 @@ 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 \
> +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.

> +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
> +}
> diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> index c542873..9c677c3 100644
> --- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> +++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
> @@ -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.

> -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
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel



-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [meta-oe][meta-networking][PATCH 0/3] ntp updates
  2012-10-19 20:38 [meta-oe][meta-networking][PATCH 0/3] ntp updates Morgan Little
                   ` (2 preceding siblings ...)
  2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes Morgan Little
@ 2012-10-23 15:28 ` Joe MacDonald
  3 siblings, 0 replies; 9+ messages in thread
From: Joe MacDonald @ 2012-10-23 15:28 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2944 bytes --]

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.

[[oe] [meta-oe][meta-networking][PATCH 0/3] ntp updates] On 12.10.19 (Fri 16:38) Morgan Little wrote:

> The following changes since commit a660f4a0289884f516ed85a75a25c722e31e88c9:
>   Paul Eggleton (1):
>         modphp: make LICENSE more accurate
> 
> are available in the git repository at:
> 
>   git@github.com: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
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-10-23 15:42 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-19 20:38 [meta-oe][meta-networking][PATCH 0/3] ntp updates Morgan Little
2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 1/3] ntp: Move from meta-oe to meta-networking Morgan Little
2012-10-20 11:43   ` Otavio Salvador
2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 2/3] ntp: Uprev from 4.2.6p3 to 4.2.6p5 Morgan Little
2012-10-20 11:43   ` Otavio Salvador
2012-10-20 11:46   ` Otavio Salvador
2012-10-19 20:38 ` [meta-oe][meta-networking][PATCH 3/3] ntp: Clean up recipes Morgan Little
2012-10-20 11:49   ` Otavio Salvador
2012-10-23 15:28 ` [meta-oe][meta-networking][PATCH 0/3] ntp updates Joe MacDonald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox