From 835a1e2863fac9065690b5a79c0ca120f398e533 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 16 Mar 2014 16:02:18 +0100 Subject: [PATCH] tzdata: Update to 2014a. --- config/rootfiles/common/tzdata | 32 +++++++++----------------------- lfs/tzdata | 34 +++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index 7362a0f8a..2ffb7b56e 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -281,6 +281,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Kashgar #usr/share/zoneinfo/Asia/Kathmandu #usr/share/zoneinfo/Asia/Katmandu ++usr/share/zoneinfo/Asia/Khandyga #usr/share/zoneinfo/Asia/Kolkata #usr/share/zoneinfo/Asia/Krasnoyarsk #usr/share/zoneinfo/Asia/Kuala_Lumpur @@ -304,9 +305,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Qyzylorda #usr/share/zoneinfo/Asia/Rangoon #usr/share/zoneinfo/Asia/Riyadh -#usr/share/zoneinfo/Asia/Riyadh87 -#usr/share/zoneinfo/Asia/Riyadh88 -#usr/share/zoneinfo/Asia/Riyadh89 #usr/share/zoneinfo/Asia/Saigon #usr/share/zoneinfo/Asia/Sakhalin #usr/share/zoneinfo/Asia/Samarkand @@ -325,6 +323,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Ulaanbaatar #usr/share/zoneinfo/Asia/Ulan_Bator #usr/share/zoneinfo/Asia/Urumqi ++usr/share/zoneinfo/Asia/Ust-Nera #usr/share/zoneinfo/Asia/Vientiane #usr/share/zoneinfo/Asia/Vladivostok #usr/share/zoneinfo/Asia/Yakutsk @@ -440,6 +439,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Brussels #usr/share/zoneinfo/Europe/Bucharest #usr/share/zoneinfo/Europe/Budapest ++usr/share/zoneinfo/Europe/Busingen #usr/share/zoneinfo/Europe/Chisinau #usr/share/zoneinfo/Europe/Copenhagen #usr/share/zoneinfo/Europe/Dublin @@ -524,10 +524,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/Mexico/BajaNorte #usr/share/zoneinfo/Mexico/BajaSur #usr/share/zoneinfo/Mexico/General -#usr/share/zoneinfo/Mideast -#usr/share/zoneinfo/Mideast/Riyadh87 -#usr/share/zoneinfo/Mideast/Riyadh88 -#usr/share/zoneinfo/Mideast/Riyadh89 #usr/share/zoneinfo/NZ #usr/share/zoneinfo/NZ-CHAT #usr/share/zoneinfo/Navajo @@ -886,6 +882,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Kashgar #usr/share/zoneinfo/posix/Asia/Kathmandu #usr/share/zoneinfo/posix/Asia/Katmandu ++usr/share/zoneinfo/posix/Asia/Khandyga #usr/share/zoneinfo/posix/Asia/Kolkata #usr/share/zoneinfo/posix/Asia/Krasnoyarsk #usr/share/zoneinfo/posix/Asia/Kuala_Lumpur @@ -909,9 +906,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Qyzylorda #usr/share/zoneinfo/posix/Asia/Rangoon #usr/share/zoneinfo/posix/Asia/Riyadh -#usr/share/zoneinfo/posix/Asia/Riyadh87 -#usr/share/zoneinfo/posix/Asia/Riyadh88 -#usr/share/zoneinfo/posix/Asia/Riyadh89 #usr/share/zoneinfo/posix/Asia/Saigon #usr/share/zoneinfo/posix/Asia/Sakhalin #usr/share/zoneinfo/posix/Asia/Samarkand @@ -930,6 +924,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Ulaanbaatar #usr/share/zoneinfo/posix/Asia/Ulan_Bator #usr/share/zoneinfo/posix/Asia/Urumqi ++usr/share/zoneinfo/posix/Asia/Ust-Nera #usr/share/zoneinfo/posix/Asia/Vientiane #usr/share/zoneinfo/posix/Asia/Vladivostok #usr/share/zoneinfo/posix/Asia/Yakutsk @@ -1045,6 +1040,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Brussels #usr/share/zoneinfo/posix/Europe/Bucharest #usr/share/zoneinfo/posix/Europe/Budapest ++usr/share/zoneinfo/posix/Europe/Busingen #usr/share/zoneinfo/posix/Europe/Chisinau #usr/share/zoneinfo/posix/Europe/Copenhagen #usr/share/zoneinfo/posix/Europe/Dublin @@ -1093,7 +1089,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Zagreb #usr/share/zoneinfo/posix/Europe/Zaporozhye #usr/share/zoneinfo/posix/Europe/Zurich -#usr/share/zoneinfo/posix/Factory #usr/share/zoneinfo/posix/GB #usr/share/zoneinfo/posix/GB-Eire #usr/share/zoneinfo/posix/GMT @@ -1129,10 +1124,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Mexico/BajaNorte #usr/share/zoneinfo/posix/Mexico/BajaSur #usr/share/zoneinfo/posix/Mexico/General -#usr/share/zoneinfo/posix/Mideast -#usr/share/zoneinfo/posix/Mideast/Riyadh87 -#usr/share/zoneinfo/posix/Mideast/Riyadh88 -#usr/share/zoneinfo/posix/Mideast/Riyadh89 #usr/share/zoneinfo/posix/NZ #usr/share/zoneinfo/posix/NZ-CHAT #usr/share/zoneinfo/posix/Navajo @@ -1491,6 +1482,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Kashgar #usr/share/zoneinfo/right/Asia/Kathmandu #usr/share/zoneinfo/right/Asia/Katmandu ++usr/share/zoneinfo/right/Asia/Khandyga #usr/share/zoneinfo/right/Asia/Kolkata #usr/share/zoneinfo/right/Asia/Krasnoyarsk #usr/share/zoneinfo/right/Asia/Kuala_Lumpur @@ -1514,9 +1506,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Qyzylorda #usr/share/zoneinfo/right/Asia/Rangoon #usr/share/zoneinfo/right/Asia/Riyadh -#usr/share/zoneinfo/right/Asia/Riyadh87 -#usr/share/zoneinfo/right/Asia/Riyadh88 -#usr/share/zoneinfo/right/Asia/Riyadh89 #usr/share/zoneinfo/right/Asia/Saigon #usr/share/zoneinfo/right/Asia/Sakhalin #usr/share/zoneinfo/right/Asia/Samarkand @@ -1535,6 +1524,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Ulaanbaatar #usr/share/zoneinfo/right/Asia/Ulan_Bator #usr/share/zoneinfo/right/Asia/Urumqi ++usr/share/zoneinfo/right/Asia/Ust-Nera #usr/share/zoneinfo/right/Asia/Vientiane #usr/share/zoneinfo/right/Asia/Vladivostok #usr/share/zoneinfo/right/Asia/Yakutsk @@ -1650,6 +1640,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Brussels #usr/share/zoneinfo/right/Europe/Bucharest #usr/share/zoneinfo/right/Europe/Budapest ++usr/share/zoneinfo/right/Europe/Busingen #usr/share/zoneinfo/right/Europe/Chisinau #usr/share/zoneinfo/right/Europe/Copenhagen #usr/share/zoneinfo/right/Europe/Dublin @@ -1698,7 +1689,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Zagreb #usr/share/zoneinfo/right/Europe/Zaporozhye #usr/share/zoneinfo/right/Europe/Zurich -#usr/share/zoneinfo/right/Factory #usr/share/zoneinfo/right/GB #usr/share/zoneinfo/right/GB-Eire #usr/share/zoneinfo/right/GMT @@ -1734,10 +1724,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Mexico/BajaNorte #usr/share/zoneinfo/right/Mexico/BajaSur #usr/share/zoneinfo/right/Mexico/General -#usr/share/zoneinfo/right/Mideast -#usr/share/zoneinfo/right/Mideast/Riyadh87 -#usr/share/zoneinfo/right/Mideast/Riyadh88 -#usr/share/zoneinfo/right/Mideast/Riyadh89 #usr/share/zoneinfo/right/NZ #usr/share/zoneinfo/right/NZ-CHAT #usr/share/zoneinfo/right/Navajo diff --git a/lfs/tzdata b/lfs/tzdata index edf5ff22d..c36b7a34f 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -24,15 +24,18 @@ include Config -VER = 2012h -TZDATA_VER = 2012h -TZCODE_VER = 2012h +VER = 2014a +TZDATA_VER = $(VER) +TZCODE_VER = $(VER) THISAPP = tzdata-$(VER) DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +FILES = africa antarctica asia australasia europe \ + northamerica southamerica pacificnew etcetera backward + ############################################################################### # Top-level Rules ############################################################################### @@ -42,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_MD5 = b937335e087fb85b7f8e3ce33e69184b -tzcode$(TZCODE_VER).tar.gz_MD5 = 44b3b6c3e50240ac44f16437040a7ba2 +tzdata$(TZDATA_VER).tar.gz_MD5 = 423a11bcffc10dda578058cf1587d048 +tzcode$(TZCODE_VER).tar.gz_MD5 = 77ccbb720f0f2076f12dff6ded70eb98 install : $(TARGET) @@ -77,16 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP) tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP) - cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \ - TZDIR=/usr/share/zoneinfo all - cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \ - TZDIR=/usr/share/zoneinfo install + cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right} + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \ + -L /dev/null -p GMT $(FILES) + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \ + -L /dev/null $(FILES) + cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \ + -L /dev/null $(FILES) - -mkdir -pv /usr/share/zoneinfo - mv -v /usr/share/zoneinfo-posix /usr/share/zoneinfo/posix - mv -v /usr/share/zoneinfo-leaps /usr/share/zoneinfo/right - rm -vf /usr/share/zoneinfo/localtime + rm -rf /usr/share/zoneinfo + cd $(DIR_APP) && cp -prd zoneinfo /usr/share + cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \ + /usr/share/zoneinfo + rm -vf /usr/share/zoneinfo/localtime cp -vf /usr/share/zoneinfo/GMT /etc/localtime + @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2