From 2b7072eb11d40699b031b2d96f28dc8331a5d55f Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Wed, 8 Dec 2021 15:55:06 -0500 Subject: [PATCH] tzdata: upversion to 2021e and start building We need to install the leap-seconds.list file as the prebuilts don't. This file is needed for later versions of ptp. Verification: - tzdata package now builds - check built package to ensure it contains the leap-seconds.list file - build-iso and make sure it contains the new rpm - boot the iso and ensure nothing weird observed regarding the date - run "export TZ=/usr/share/zoneinfo/EST5EDT" followed by the date command and ensure that it displays the correct time for that timezone Story: 2009130 Task: 44276 Change-Id: I57ce64d49cbf3f6a1de95aa7df462f7ae9daa1ad Signed-off-by: Jim Somerville --- base/tzdata/centos/build_srpm.data | 1 + ...ll-leap-seconds.list-for-ptp-support.patch | 28 +++++++++++++++++++ base/tzdata/centos/meta_patches/PATCH_ORDER | 2 ++ ...te-package-versioning-for-TIS-format.patch | 27 ++++++++++++++++++ base/tzdata/centos/srpm_path | 1 + centos_pkg_dirs | 1 + centos_srpms_centos.lst | 1 + 7 files changed, 61 insertions(+) create mode 100644 base/tzdata/centos/build_srpm.data create mode 100644 base/tzdata/centos/meta_patches/Install-leap-seconds.list-for-ptp-support.patch create mode 100644 base/tzdata/centos/meta_patches/PATCH_ORDER create mode 100644 base/tzdata/centos/meta_patches/Update-package-versioning-for-TIS-format.patch create mode 100644 base/tzdata/centos/srpm_path diff --git a/base/tzdata/centos/build_srpm.data b/base/tzdata/centos/build_srpm.data new file mode 100644 index 000000000..69abd61b8 --- /dev/null +++ b/base/tzdata/centos/build_srpm.data @@ -0,0 +1 @@ +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/base/tzdata/centos/meta_patches/Install-leap-seconds.list-for-ptp-support.patch b/base/tzdata/centos/meta_patches/Install-leap-seconds.list-for-ptp-support.patch new file mode 100644 index 000000000..08dacbf85 --- /dev/null +++ b/base/tzdata/centos/meta_patches/Install-leap-seconds.list-for-ptp-support.patch @@ -0,0 +1,28 @@ +From e5c32e5a5f80ce787dd169a7406d7e5436cb7d85 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jim Somerville +Date: Mon, 6 Dec 2021 17:42:09 -0500 +Subject: [PATCH] Install leap-seconds.list for ptp support + +Signed-off-by: Jim Somerville +--- + SPECS/tzdata.spec | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec +index 8bfcc60..3e780ac 100644 +--- a/SPECS/tzdata.spec ++++ b/SPECS/tzdata.spec +@@ -133,6 +133,9 @@ cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi + mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 + install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ + ++# ptp requires the leap-seconds.list file ++install -p -m 644 leap-seconds.list $RPM_BUILD_ROOT%{_datadir}/zoneinfo ++ + %clean + rm -rf $RPM_BUILD_ROOT + +-- +2.29.2 + diff --git a/base/tzdata/centos/meta_patches/PATCH_ORDER b/base/tzdata/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..5abeee47a --- /dev/null +++ b/base/tzdata/centos/meta_patches/PATCH_ORDER @@ -0,0 +1,2 @@ +Update-package-versioning-for-TIS-format.patch +Install-leap-seconds.list-for-ptp-support.patch diff --git a/base/tzdata/centos/meta_patches/Update-package-versioning-for-TIS-format.patch b/base/tzdata/centos/meta_patches/Update-package-versioning-for-TIS-format.patch new file mode 100644 index 000000000..c9d64efc5 --- /dev/null +++ b/base/tzdata/centos/meta_patches/Update-package-versioning-for-TIS-format.patch @@ -0,0 +1,27 @@ +From 2cb90e6a38fd8e0890c55ceab72926d2850c1872 Mon Sep 17 00:00:00 2001 +Message-Id: <2cb90e6a38fd8e0890c55ceab72926d2850c1872.1641936995.git.Jim.Somerville@windriver.com> +From: Jim Somerville +Date: Mon, 6 Dec 2021 16:42:24 -0500 +Subject: [PATCH] Update package versioning for TIS format + +Signed-off-by: Jim Somerville +--- + SPECS/tzdata.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec +index a25faf4..35161e5 100644 +--- a/SPECS/tzdata.spec ++++ b/SPECS/tzdata.spec +@@ -3,7 +3,7 @@ Name: tzdata + Version: 2021e + %define tzdata_version 2021e + %define tzcode_version 2021e +-Release: 1%{?dist} ++Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} + License: Public Domain + Group: System Environment/Base + URL: https://www.iana.org/time-zones +-- +2.29.2 + diff --git a/base/tzdata/centos/srpm_path b/base/tzdata/centos/srpm_path new file mode 100644 index 000000000..01670503b --- /dev/null +++ b/base/tzdata/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/tzdata-2021e-1.el7.src.rpm diff --git a/centos_pkg_dirs b/centos_pkg_dirs index b5c88a76d..1002f41f3 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -101,3 +101,4 @@ networking/iproute networking/iptables networking/keepalived networking/libnftnl +base/tzdata diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 5b260e384..a5c771d1c 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -39,4 +39,5 @@ sudo-1.8.23-10.el7_9.1.src.rpm systemd-219-78.el7_9.3.src.rpm tboot-1.9.6-3.el7.src.rpm tpm2-tools-3.0.4-2.el7.src.rpm +tzdata-2021e-1.el7.src.rpm watchdog-5.13-12.el7.src.rpm