From 1bbcf7596b4e73481ebbad6ef0ae46aa9ceb9bbc Mon Sep 17 00:00:00 2001 From: Scott Little Date: Tue, 20 Feb 2024 15:15:46 -0500 Subject: [PATCH] update tzdata tzdata expires every 6-12 months. Update to the latest tzdata, valid until Dec 2024 The new tzdata is supplied by upstream, we no longer need to build it ourselves. We just need to be sure it is included in the iso. Verification: - tzdata is no longer built - build-iso and make sure it contains the new package - check the package to ensure it contains the expected leap-seconds.list file - 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 Partial-Bug: 2054466 Change-Id: I765dc225f9b9f23799af662cd87fe94703857241 Signed-off-by: Scott Little --- base/tzdata/debian/meta_data.yaml | 7 --- .../0001-No-leap-second-on-2023-12-31.patch | 43 ------------------- base/tzdata/debian/patches/series | 1 - debian_iso_image.inc | 3 -- debian_pkg_dirs | 1 - 5 files changed, 55 deletions(-) delete mode 100644 base/tzdata/debian/meta_data.yaml delete mode 100644 base/tzdata/debian/patches/0001-No-leap-second-on-2023-12-31.patch delete mode 100644 base/tzdata/debian/patches/series diff --git a/base/tzdata/debian/meta_data.yaml b/base/tzdata/debian/meta_data.yaml deleted file mode 100644 index d02bd6e65..000000000 --- a/base/tzdata/debian/meta_data.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -debver: 2023c-10 -debname: tzdata -archive: https://snapshot.debian.org/archive/debian/20231001T025741Z/pool/main/t/tzdata/ -revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true diff --git a/base/tzdata/debian/patches/0001-No-leap-second-on-2023-12-31.patch b/base/tzdata/debian/patches/0001-No-leap-second-on-2023-12-31.patch deleted file mode 100644 index 0551f2126..000000000 --- a/base/tzdata/debian/patches/0001-No-leap-second-on-2023-12-31.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a988607febfcb518857b5120a1bbcfe2ac68b838 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Tue, 17 Oct 2023 14:40:42 -0400 -Subject: [PATCH] No leap second on 2023-12-31 - -Per IERS Bulletin C 66 (2023-07-04). -https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.66 - -* leap-seconds.list: Update file from NIST, retrieved from -ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list - -Signed-off-by: Scott Little ---- - leap-seconds.list | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/leap-seconds.list b/leap-seconds.list -index 17e3a10..3fe9a12 100644 ---- a/leap-seconds.list -+++ b/leap-seconds.list -@@ -204,10 +204,10 @@ - # current -- the update time stamp, the data and the name of the file - # will not change. - # --# Updated through IERS Bulletin C65 --# File expires on: 28 December 2023 -+# Updated through IERS Bulletin C66 -+# File expires on: 28 June 2024 - # --#@ 3912710400 -+#@ 3928521600 - # - 2272060800 10 # 1 Jan 1972 - 2287785600 11 # 1 Jul 1972 -@@ -252,4 +252,4 @@ - # the hash line is also ignored in the - # computation. - # --#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe -+#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1 --- -2.7.4 - diff --git a/base/tzdata/debian/patches/series b/base/tzdata/debian/patches/series deleted file mode 100644 index 1f2cac93e..000000000 --- a/base/tzdata/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-No-leap-second-on-2023-12-31.patch diff --git a/debian_iso_image.inc b/debian_iso_image.inc index 8029b9e27..8925bfbf4 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -420,8 +420,5 @@ systemd-presets #trident-installer trident-installer -#tzdata -tzdata - #watchdog watchdog diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 3c334920b..b8759194d 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -12,7 +12,6 @@ base/pf-bb-config base/synce4l base/systemd base/systemd-presets -base/tzdata base/watchdog centos-debian-compat ceph/ceph