From patchwork Sun Jul 12 18:44:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 494164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id A9BDC1402D6 for ; Mon, 13 Jul 2015 04:45:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=BgJn63ZF; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E476C33020; Sun, 12 Jul 2015 18:45:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eOyJ5pY-gHTW; Sun, 12 Jul 2015 18:45:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E29DA3332E; Sun, 12 Jul 2015 18:45:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B0CF21C0593 for ; Sun, 12 Jul 2015 18:45:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ACC82A2E77 for ; Sun, 12 Jul 2015 18:45:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MjiB0eEdG1Wm for ; Sun, 12 Jul 2015 18:45:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3E5EEA2E76 for ; Sun, 12 Jul 2015 18:45:16 +0000 (UTC) Received: by wgmn9 with SMTP id n9so28102329wgm.0 for ; Sun, 12 Jul 2015 11:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=spy9NUZtjCapkWa32KftciOKgdC92x9lvNwpqLoJv6o=; b=BgJn63ZFj3PTahUFwJiDemyDSHFFE8bml3Mypc7zxBAxC1FSH5yI8x4/GpCdIUmS5K UR3stgXsgiKi17A9zByq8A5wwu+HgJ5m6eLxExH/y81ncVy7wCDbH8PCPqmp41txKhMS IJuZoHIQCP/bG24uQglmDY/fLmPPYwn1i9KipSVNi8OPtSwwmxAXDmbBPD1NMsPCPKHZ gD8DkQEOlGulfGHnDo1g87IXqPXQ9bsiYpQA4skjXLIf0A1IRshm+CeN4Ykgyf+vtTJ5 y79vrQ68lSu8h0YaZQFF8/PJMY7oTwcJHSsIUsGxD26brTVLPWVY0qWLVhz2LIOyl5wA tkAg== X-Received: by 10.180.24.65 with SMTP id s1mr15148008wif.66.1436726714848; Sun, 12 Jul 2015 11:45:14 -0700 (PDT) Received: from cerise.home (AToulouse-657-1-1031-128.w92-134.abo.wanadoo.fr. [92.134.9.128]) by smtp.gmail.com with ESMTPSA id ev8sm24676751wjb.8.2015.07.12.11.45.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jul 2015 11:45:14 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 12 Jul 2015 20:44:58 +0200 Message-Id: <1436726698-17776-3-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436726698-17776-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1436726698-17776-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH v5 3/3] package: busybox: Collocate ntp startup script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Instead of having an NTP startup scripts for NTPD, Busybox's NTPD, OpenNTPD, have only one available in Busybox and make the rest symlink to it. The configuration file is also common. Signed-off-by: Maxime Hadjinlian --- package/busybox/S49ntp | 29 +++++++++++++++++++++++++++++ package/busybox/busybox.mk | 11 +++++++++++ package/busybox/ntp.conf | 4 ++++ package/ntp/S49ntp | 39 +-------------------------------------- package/ntp/ntp.conf | 1 + package/ntp/ntp.mk | 2 +- package/ntp/ntpd.etc.conf | 8 -------- package/openntpd/S49ntp | 26 +------------------------- 8 files changed, 48 insertions(+), 72 deletions(-) create mode 100644 package/busybox/S49ntp create mode 100644 package/busybox/ntp.conf mode change 100755 => 120000 package/ntp/S49ntp create mode 120000 package/ntp/ntp.conf delete mode 100644 package/ntp/ntpd.etc.conf mode change 100755 => 120000 package/openntpd/S49ntp diff --git a/package/busybox/S49ntp b/package/busybox/S49ntp new file mode 100644 index 0000000..50b2aba --- /dev/null +++ b/package/busybox/S49ntp @@ -0,0 +1,29 @@ +#! /bin/sh + +NAME=ntpd + +[ -x /usr/sbin/${NAME} ] || exit 0 +[ -f /etc/${NAME}.conf ] || exit 0 + +case "$1" in + start) + echo -n "Starting ${NAME}: " + start-stop-daemon -S -x /usr/sbin/${NAME} -- -p /run/${NAME}.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + echo -n "Stopping ${NAME}: " + start-stop-daemon -K -q -p /run/${NAME}.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac + +exit 0 diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d722e02..9998bf4 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -135,6 +135,17 @@ define BUSYBOX_INSTALL_UDHCPC_SCRIPT fi endef +define BUSYBOX_INSTALL_NTPD_SCRIPT + if grep -q CONFIG_NTPD=y $(@D)/.config; then \ + $(INSTALL) -m 0755 -D package/busybox/S49ntp \ + $(TARGET_DIR)/etc/init.d/S49ntp; \ + fi + if grep -q CONFIG_FEATURE_NTPD_CONF=y $(@D)/.config; then \ + $(INSTALL) -m 0644 -D package/busybox/ntp.conf \ + $(TARGET_DIR)/etc/ntp.conf; \ + fi +endef + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_SET_INIT $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG)) diff --git a/package/busybox/ntp.conf b/package/busybox/ntp.conf new file mode 100644 index 0000000..1e8afc5 --- /dev/null +++ b/package/busybox/ntp.conf @@ -0,0 +1,4 @@ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 3.pool.ntp.org +server 4.pool.ntp.org diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp deleted file mode 100755 index 171c200..0000000 --- a/package/ntp/S49ntp +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh - -NAME=ntpd -DAEMON=/usr/sbin/$NAME - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# Read config file if it is present. -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -case "$1" in - start) - echo -n "Starting $NAME: " - start-stop-daemon -S -q -x $DAEMON -- -g - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - echo -n "Stopping $NAME: " - start-stop-daemon -K -q -n $NAME - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - echo "Restarting $NAME: " - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp new file mode 120000 index 0000000..2062ffd --- /dev/null +++ b/package/ntp/S49ntp @@ -0,0 +1 @@ +../busybox/S49ntp \ No newline at end of file diff --git a/package/ntp/ntp.conf b/package/ntp/ntp.conf new file mode 120000 index 0000000..8dbf833 --- /dev/null +++ b/package/ntp/ntp.conf @@ -0,0 +1 @@ +../busybox/ntp.conf \ No newline at end of file diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 5997247..14bbcc7 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -53,7 +53,7 @@ NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj define NTP_INSTALL_TARGET_CMDS $(if $(BR2_PACKAGE_NTP_NTPD), install -m 755 $(@D)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd) test -z "$(NTP_INSTALL_FILES_y)" || install -m 755 $(addprefix $(@D)/,$(NTP_INSTALL_FILES_y)) $(TARGET_DIR)/usr/bin/ - $(INSTALL) -m 644 package/ntp/ntpd.etc.conf $(TARGET_DIR)/etc/ntp.conf + $(INSTALL) -m 644 package/ntp/ntp.conf $(TARGET_DIR)/etc/ntp.conf endef ifeq ($(BR2_PACKAGE_NTP_NTPD),y) diff --git a/package/ntp/ntpd.etc.conf b/package/ntp/ntpd.etc.conf deleted file mode 100644 index 543c8ff..0000000 --- a/package/ntp/ntpd.etc.conf +++ /dev/null @@ -1,8 +0,0 @@ -server 0.pool.ntp.org iburst -server 1.pool.ntp.org iburst - -# Allow only time queries, at a limited rate, sending KoD when in excess. -# Allow all local queries (IPv4, IPv6) -restrict default nomodify nopeer noquery limited kod -restrict 127.0.0.1 -restrict [::1] diff --git a/package/openntpd/S49ntp b/package/openntpd/S49ntp deleted file mode 100755 index 2654f82..0000000 --- a/package/openntpd/S49ntp +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -[ -x /usr/sbin/ntpd ] || exit 0 -[ -f /etc/ntpd.conf ] || exit 0 - -case "$1" in - start) - echo -n "Starting openntpd: " - start-stop-daemon -S -x /usr/sbin/ntpd -- -p /run/ntpd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - echo -n "Stopping openntpd: " - start-stop-daemon -K -q -p /run/ntpd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package/openntpd/S49ntp b/package/openntpd/S49ntp new file mode 120000 index 0000000..2062ffd --- /dev/null +++ b/package/openntpd/S49ntp @@ -0,0 +1 @@ +../busybox/S49ntp \ No newline at end of file