7 files changed, 245 insertions, 0 deletions

diff --git a/meta/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch b/meta/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
new file mode 100644
index 0000000000..cb1e2f7341
--- /dev/null
+++ b/meta/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/recipes-support/ntp/files/ntp.conf b/meta/recipes-support/ntp/files/ntp.conf
new file mode 100644
index 0000000000..a9cc838450
--- /dev/null
+++ b/meta/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 time.server.example.com
+# 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/recipes-support/ntp/files/ntpd b/meta/recipes-support/ntp/files/ntpd
new file mode 100755
index 0000000000..ae50f135d0
--- /dev/null
+++ b/meta/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/recipes-support/ntp/files/ntpdate b/meta/recipes-support/ntp/files/ntpdate
new file mode 100755
index 0000000000..ab0551c5a5
--- /dev/null
+++ b/meta/recipes-support/ntp/files/ntpdate
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/bin
+
+test -x /usr/bin/ntpdate || exit 0
+
+if test -f /etc/default/ntpdate ; then
+. /etc/default/ntpdate
+fi
+
+if [ "$NTPSERVERS" = "" ] ; then
+        if [ "$METHOD" = "" -a "$1" != "silent" ] ; then
+                echo "Please set NTPSERVERS in /etc/default/ntpdate"
+                exit 1
+        else
+                exit 0
+        fi
+fi
+
+# 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/recipes-support/ntp/files/ntpdate.default b/meta/recipes-support/ntp/files/ntpdate.default
new file mode 100644
index 0000000000..486b6e07d3
--- /dev/null
+++ b/meta/recipes-support/ntp/files/ntpdate.default
@@ -0,0 +1,7 @@
+# Configuration script used by ntpdate-sync script
+
+NTPSERVERS=""
+
+# Set to "yes" to write time to hardware clock on success
+UPDATE_HWCLOCK="no"
+
diff --git a/meta/recipes-support/ntp/files/openssl-check.patch b/meta/recipes-support/ntp/files/openssl-check.patch
new file mode 100644
index 0000000000..8b4a6733cd
--- /dev/null
+++ b/meta/recipes-support/ntp/files/openssl-check.patch
@@ -0,0 +1,59 @@
+Hack OpenSSL check to work when libssl and libcrypto aren't in same dir
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+---
+ configure         |    4 ++--
+ m4/ntp_openssl.m4 |    4 ++--
+ sntp/configure    |    4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index aae2c01..6a3c15e 100755
+--- a/configure
++++ b/configure
+@@ -22868,8 +22868,8 @@ case "$ans" in
+            test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
+            ;;
+         *)
+-           test -f $i/libcrypto.so -a -f $i/libssl.so && break
+-           test -f $i/libcrypto.a -a -f $i/libssl.a && break
++           test -f $i/libssl.so && break
++           test -f $i/libssl.a && break
+            ;;
+        esac
+     done
+diff --git a/m4/ntp_openssl.m4 b/m4/ntp_openssl.m4
+index 7d9f477..67bdd55 100644
+--- a/m4/ntp_openssl.m4
++++ b/m4/ntp_openssl.m4
+@@ -41,8 +41,8 @@ case "$ans" in
+            test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
+            ;;
+         *)
+-           test -f $i/libcrypto.so -a -f $i/libssl.so && break
+-           test -f $i/libcrypto.a -a -f $i/libssl.a && break
++           test -f $i/libssl.so && break
++           test -f $i/libssl.a && break
+            ;;
+        esac
+     done
+diff --git a/sntp/configure b/sntp/configure
+index 7782c29..55e82d9 100755
+--- a/sntp/configure
++++ b/sntp/configure
+@@ -14810,8 +14810,8 @@ case "$ans" in
+            test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
+            ;;
+         *)
+-           test -f $i/libcrypto.so -a -f $i/libssl.so && break
+-           test -f $i/libcrypto.a -a -f $i/libssl.a && break
++           test -f $i/libssl.so && break
++           test -f $i/libssl.a && break
+            ;;
+        esac
+     done
+-- 
+1.7.1
+
diff --git a/meta/recipes-support/ntp/files/tickadj.c.patch b/meta/recipes-support/ntp/files/tickadj.c.patch
new file mode 100644
index 0000000000..9ef9de9e1f
--- /dev/null
+++ b/meta/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");
+        }