From 93f71dafeb7a8db2842acb7509e2bc2d01e7bf48 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 22 Nov 2012 16:49:34 +0000 Subject: ntp: cleanup recipes and fix SSL support * Move common definitions to the inc file * Drop override of do_configure which doesn't seem to be needed anymore * Fold ntp-ssl into the ntp recipe as a PACKAGECONFIG option for those who want it (default to off) and fix configure-time checks to detect OpenSSL properly so that it gets enabled when selected * Remove ntp-bin package and put its contents in currently empty ntp-utils package (with migration path) * Fix hardcoded paths in ntpd initscript * Specify ntpd.conf as a configuration file for packaging purposes * Rearrange so that packaging definitions are towards the end in the expected order * Delete unused "ntp" initscript file * Add SUMMARY * Update HOMEPAGE This reapplies some of the changes from the original patch by Morgan Little . Signed-off-by: Paul Eggleton --- meta-networking/recipes-support/ntp/ntp.inc | 87 +++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 18 deletions(-) (limited to 'meta-networking/recipes-support/ntp/ntp.inc') diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc index 1d740f00fb..a614e3f06a 100644 --- a/meta-networking/recipes-support/ntp/ntp.inc +++ b/meta-networking/recipes-support/ntp/ntp.inc @@ -1,35 +1,86 @@ +SUMMARY = "Network Time Protocol daemon and utilities" 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" +HOMEPAGE = "http://support.ntp.org" 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 \ -" +INC_PR = "r2" -inherit autotools update-rc.d +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://openssl-check.patch \ + file://ntpd \ + file://ntp.conf \ + file://ntpdate \ + " -INITSCRIPT_NAME = "ntpd" -# No dependencies, so just go in at the standard level (20) -INITSCRIPT_PARAMS = "defaults" +inherit autotools update-rc.d # 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" +PACKAGECONFIG ??= "" +PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \ + --with-openssl-incdir=${STAGING_INCDIR} \ + --with-crypto, \ + --without-openssl --without-crypto, \ + openssl" + +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 + + # Fix hardcoded paths in scripts + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd + + install -d ${D}${sysconfdir}/network/if-up.d + install -m 755 ${WORKDIR}/ntpdate ${D}${sysconfdir}/network/if-up.d +} + +PACKAGES += "ntpdate ${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" +# 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" +# Handle move from bin to utils package +RPROVIDES_${PN}-utils = "${PN}-bin" +RREPLACES_${PN}-utils = "${PN}-bin" +RCONFLICTS_${PN}-utils = "${PN}-bin" + +RSUGGESTS_${PN} = "iana-etc" + +FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}" +FILES_${PN}-tickadj = "${bindir}/tickadj" +FILES_${PN}-utils = "${bindir}" +FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate" + +CONFFILES_${PN} = "${sysconfdir}/ntp.conf" + +INITSCRIPT_NAME = "ntpd" +# No dependencies, so just go in at the standard level (20) +INITSCRIPT_PARAMS = "defaults" + +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 +} + -- cgit 1.2.3-korg