From 32721433e01f18dd83a295ed4e3579ad40537354 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 19 Dec 2016 19:27:22 -0600 Subject: add features to busybox to debug ntp and set nice to -20 for ntp --- recipes-support/ntp/files/ntpd-init.patch | 11 +++++++++++ recipes-support/ntp/ntp_4.2.6p5.bbappend | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 recipes-support/ntp/files/ntpd-init.patch create mode 100644 recipes-support/ntp/ntp_4.2.6p5.bbappend (limited to 'recipes-support/ntp') diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch new file mode 100644 index 0000000..fc388f8 --- /dev/null +++ b/recipes-support/ntp/files/ntpd-init.patch @@ -0,0 +1,11 @@ +--- old/ntpd 2016-12-19 18:11:58.022663976 -0600 ++++ new/ntpd 2016-12-19 18:12:56.618663852 -0600 +@@ -23,7 +23,7 @@ + # 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/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@" ++ start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@" + echo "done" + } + stopdaemon(){ diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_4.2.6p5.bbappend new file mode 100644 index 0000000..528c6c9 --- /dev/null +++ b/recipes-support/ntp/ntp_4.2.6p5.bbappend @@ -0,0 +1,11 @@ +PR .= ".mlinux1" + +SRC_URI += " file://ntpd-init.patch;patchdir=.. \ + " +FILESEXTRAPATHS_prepend := "${THISDIR}/files" + +python do_patch_prepend () { + import os + cwd = os.getcwd() + bb.note("Hello %s",cwd) +} -- cgit v1.2.3 From 29d9d49e75f3371413efce6b67a850d1a54b3bea Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 20 Dec 2016 17:26:54 -0600 Subject: Add GPS specific configuration, add empty files/directories with permissions --- recipes-support/ntp/files/ntp.conf.patch | 51 ++++++++++++++++++++++++++++++++ recipes-support/ntp/ntp_4.2.6p5.bbappend | 15 ++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 recipes-support/ntp/files/ntp.conf.patch (limited to 'recipes-support/ntp') diff --git a/recipes-support/ntp/files/ntp.conf.patch b/recipes-support/ntp/files/ntp.conf.patch new file mode 100644 index 0000000..0700553 --- /dev/null +++ b/recipes-support/ntp/files/ntp.conf.patch @@ -0,0 +1,51 @@ +diff -u old/ntp.conf new/ntp.conf +--- old/ntp.conf 2016-12-20 15:41:04.992738081 -0600 ++++ new/ntp.conf 2016-12-20 16:07:40.632709506 -0600 +@@ -1,7 +1,19 @@ +-# 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 ++ ++# The following code is for evaluating the timeserver. ++# Remove the # to activate the statistics ++# statistics loopstats ++# statistics peerstats ++# statsdir /var/log/ntpstats ++# filegen peerstats file peerstats type day link enable ++# filegen loopstats file loopstats type day link enable ++ ++# This is the US timeserver pool. You should use a pool ++# close to your location. ++#pool us.pool.ntp.org iburst ++ + # This should be a server that is close (in IP terms) + # to the machine. Add other servers as required. + # Unless you un-comment the line below ntpd will sync +@@ -9,8 +21,26 @@ + # + # server time.server.example.com + # ++ ++logfile /var/log/ntp.log ++ ++restrict default kod nomodify notrap nopeer noquery ++restrict -6 default kod nomodify notrap nopeer noquery ++restrict 127.0.0.1 mask 255.255.255.0 ++restrict -6 ::1 ++ ++# GPS Serial data reference (NTP0) ++server 127.127.28.0 ++fudge 127.127.28.0 time1 0.080 refid GPS ++ ++# GPS PPS reference (NTP2) ++server 127.127.28.2 prefer ++fudge 127.127.28.2 time1 0.000 refid PPS ++ + # Using local hardware clock as fallback + # Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself ++# The stratum should be a high value so this does not get chosen ++# except in dire circumstances. + server 127.127.1.0 + fudge 127.127.1.0 stratum 14 + # Defining a default security setting diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_4.2.6p5.bbappend index 528c6c9..9c6419e 100644 --- a/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ b/recipes-support/ntp/ntp_4.2.6p5.bbappend @@ -1,11 +1,22 @@ PR .= ".mlinux1" SRC_URI += " file://ntpd-init.patch;patchdir=.. \ + file://ntp.conf.patch;patchdir=.. \ " FILESEXTRAPATHS_prepend := "${THISDIR}/files" python do_patch_prepend () { import os - cwd = os.getcwd() - bb.note("Hello %s",cwd) } +pkg_postinst_${PN} () { + touch /etc/ntp.drift + chown ntp:ntp /etc/ntp.drift + chmod 664 /etc/ntp.drift + if ! [[ -d /var/log/ntpstats ]] ; then + mkdir -p /var/log/ntpstats + fi + + chown ntp:ntp /var/log/ntpstats + chmod 775 /var/log/ntpstats +} + -- cgit v1.2.3 From 2ba73a35c4907336858320b31ce515a6aa10698f Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 21 Dec 2016 08:46:44 -0600 Subject: ntp.drift must be in a directory writable by ntp --- recipes-support/ntp/files/ntp.conf.patch | 12 +++++++----- recipes-support/ntp/ntp_4.2.6p5.bbappend | 12 ++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'recipes-support/ntp') diff --git a/recipes-support/ntp/files/ntp.conf.patch b/recipes-support/ntp/files/ntp.conf.patch index 0700553..499dac5 100644 --- a/recipes-support/ntp/files/ntp.conf.patch +++ b/recipes-support/ntp/files/ntp.conf.patch @@ -1,11 +1,13 @@ diff -u old/ntp.conf new/ntp.conf ---- old/ntp.conf 2016-12-20 15:41:04.992738081 -0600 -+++ new/ntp.conf 2016-12-20 16:07:40.632709506 -0600 -@@ -1,7 +1,19 @@ +--- old/ntp.conf 2016-12-21 08:36:33.887646960 -0600 ++++ new/ntp.conf 2016-12-21 08:37:41.115645756 -0600 +@@ -1,7 +1,20 @@ -# 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 +-driftfile /etc/ntp.drift ++# Driftfile must be in a directory owned by ntp ++driftfile /var/lib/ntp/ntp.drift + +# The following code is for evaluating the timeserver. +# Remove the # to activate the statistics @@ -22,7 +24,7 @@ diff -u old/ntp.conf new/ntp.conf # This should be a server that is close (in IP terms) # to the machine. Add other servers as required. # Unless you un-comment the line below ntpd will sync -@@ -9,8 +21,26 @@ +@@ -9,8 +22,26 @@ # # server time.server.example.com # diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_4.2.6p5.bbappend index 9c6419e..4651611 100644 --- a/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ b/recipes-support/ntp/ntp_4.2.6p5.bbappend @@ -9,14 +9,18 @@ python do_patch_prepend () { import os } pkg_postinst_${PN} () { - touch /etc/ntp.drift - chown ntp:ntp /etc/ntp.drift - chmod 664 /etc/ntp.drift if ! [[ -d /var/log/ntpstats ]] ; then mkdir -p /var/log/ntpstats fi - chown ntp:ntp /var/log/ntpstats chmod 775 /var/log/ntpstats + + if ! [[ -d /var/lib/ntp ]] ; then + mkdir -p /var/lib/ntp + fi + drfile="/var/lib/ntp/ntp.drift" + touch ${drfile} + chown ntp:ntp ${drfile} + chmod 664 ${drfile} } -- cgit v1.2.3