starlingx
/
integ
Code Issues Proposed changes

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 <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2021-12-08 15:55:06 -05:00
parent 45e97910d5
commit 2b7072eb11
7 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/tzdata/centos/build_srpm.data Normal file
View File

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

28
base/tzdata/centos/meta_patches/Install-leap-seconds.list-for-ptp-support.patch Normal file
View File

@ -0,0 +1,28 @@
From e5c32e5a5f80ce787dd169a7406d7e5436cb7d85 Mon Sep 17 00:00:00 2001
Message-Id: <e5c32e5a5f80ce787dd169a7406d7e5436cb7d85.1638830541.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 6 Dec 2021 17:42:09 -0500
Subject: [PATCH] Install leap-seconds.list for ptp support
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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

2
base/tzdata/centos/meta_patches/PATCH_ORDER Normal file
View File

@ -0,0 +1,2 @@
Update-package-versioning-for-TIS-format.patch
Install-leap-seconds.list-for-ptp-support.patch

27
base/tzdata/centos/meta_patches/Update-package-versioning-for-TIS-format.patch Normal file
View File

@ -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 <Jim.Somerville@windriver.com>
Date: Mon, 6 Dec 2021 16:42:24 -0500
Subject: [PATCH] Update package versioning for TIS format
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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

1
base/tzdata/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:Source/tzdata-2021e-1.el7.src.rpm

1
centos_pkg_dirs
View File

@ -101,3 +101,4 @@ networking/iproute
networking/iptables
networking/keepalived
networking/libnftnl
base/tzdata

1
centos_srpms_centos.lst
View File

@ -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