refactor ntp

Add ntp-config package to config the customized ntp.conf and ntpd.
With this change, ntp srpm is dropped to replaced by rpm.
ntp-config is configured to depend on ntp, so ntp will be included
in the ISO automatically.
ntp package will be installed in all type node, so no change to filter.

Test has been done:
build and deploy with multinode. confirm ntp.conf and ntpd is kept
the same as before.

Story: 2003768
Task: 27587

Change-Id: I795f0fd2b53c46c7302104a07c5d4cfe869d3c7b
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14
2018-10-31 20:27:30 +08:00
parent 90373272b8
commit 644cb5ffa8
13 changed files with 253 additions and 90 deletions

View File

@@ -1 +0,0 @@
TIS_PATCH_VER=3

View File

@@ -1,27 +0,0 @@
From 30615fcee3c857e0bb2900a64e14b807adff5495 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:29:01 -0400
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/ntp.spec
---
SPECS/ntp.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 73ab0f7..bf9c32b 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.6p5
-Release: 28%{?dist}
+Release: 28.el7.centos%{?_tis_dist}.%{tis_patch_ver}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
--
2.7.4

View File

@@ -1,3 +0,0 @@
ntp-spec-add-TiS-custom-config-files.patch
ntpd-started-no-g-option.patch
0001-Update-package-versioning-for-TIS-format.patch

View File

@@ -1,32 +0,0 @@
From a24ad7ed432352f238f51429e3c24c600c726a8a Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:29:00 -0400
Subject: WRS: ntp-spec-add-TiS-custom-config-files.patch
---
SPECS/ntp.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 52ad9aa..73ab0f7 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -46,6 +46,7 @@ Source13: ntpdate.service
Source14: ntp-wait.service
Source15: sntp.service
Source16: sntp.sysconfig
+Source17: ntp-cgcs.conf
# ntpbz #802
Patch1: ntp-4.2.6p1-sleep.patch
@@ -462,6 +463,7 @@ sed -e 's|VENDORZONE\.|%{vendorzone}|' \
touch -r %{SOURCE16} .%{_sysconfdir}/sysconfig/sntp
install -p -m600 %{SOURCE8} .%{_sysconfdir}/ntp/crypto/pw
install -p -m755 %{SOURCE10} .%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
+install -p -m644 %{SOURCE17} .%{_sysconfdir}/ntp.conf
install -p -m644 %{SOURCE12} .%{_unitdir}/ntpd.service
install -p -m644 %{SOURCE13} .%{_unitdir}/ntpdate.service
install -p -m644 %{SOURCE14} .%{_unitdir}/ntp-wait.service
--
2.7.4

View File

@@ -1,20 +0,0 @@
From 20b00ae04480db94b1bb93ddc2cdbbf5cbafd001 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:29:01 -0400
Subject: [PATCH 2/3] WRS: ntpd-started-no-g-option.patch
---
SOURCES/ntpd.sysconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SOURCES/ntpd.sysconfig b/SOURCES/ntpd.sysconfig
index 49394c7..c783890 100644
--- a/SOURCES/ntpd.sysconfig
+++ b/SOURCES/ntpd.sysconfig
@@ -1,2 +1,2 @@
# Command line options for ntpd
-OPTIONS="-g"
+OPTIONS="-p /var/run/ntp.pid"
--
1.9.1

View File

@@ -1,14 +0,0 @@
# 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 - lock everything down
restrict default ignore

View File

@@ -1 +0,0 @@
mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm