ntp: fix crontab location, run oe-stylize while I'm here

Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/ntp/ntp_4.2.4p7.bb b/recipes/ntp/ntp_4.2.4p7.bb
index f21befe..803aa0c 100644 (file)
--- a/recipes/ntp/ntp_4.2.4p7.bb
+++ b/recipes/ntp/ntp_4.2.4p7.bb
@@ -1,47 +1,48 @@
 require ntp.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-       file://tickadj.c.patch \
+        file://tickadj.c.patch \
         file://ntp-4.2.4_p6-nano.patch \
-       file://ntpd \
-       file://ntp.conf \
-       file://ntpdate"
+        file://ntpd \
+        file://ntp.conf \
+        file://ntpdate"
 
+SRC_URI[md5sum] = "8c19ff62ed4f7d64f8e2aa59cb11f364"
+SRC_URI[sha256sum] = "5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3"
+
+do_configure_prepend() {
+        sed -i -e 's:dist_man_MANS=     sntp.1::g' sntp/Makefile.am
+}
+
+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
+}
 
-# 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"
 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"
 
-do_configure_prepend() {
-       sed -i -e 's:dist_man_MANS=     sntp.1::g' sntp/Makefile.am
-}
-
-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
-}
+# 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
+        exit 1
 else
-       if ! grep -q -s ntpdate /etc/cron/crontabs/root; then
-               echo "adding crontab"
-               test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
-               echo "30 * * * *    /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
-       fi
+        if ! grep -q -s ntpdate /var/cron/tabs/root; then
+                echo "adding crontab"
+                test -d /var/cron/tabs || mkdir -p /var/cron/tabs
+                echo "30 * * * *    /usr/bin/ntpdate -s -u pool.ntp.org" >> /var/cron/tabs/root
+        fi
 fi
 }
 
-SRC_URI[md5sum] = "8c19ff62ed4f7d64f8e2aa59cb11f364"
-SRC_URI[sha256sum] = "5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3"