bump version tzdata20222f and timezone stuff

diff --git a/archive-patches/timezone.xml b/archive-patches/timezone.xml
index e0e7c9f533e18a3ce82970cb06bcea302578faad..403cabc350fc77dd6ec468b362136c95f4f2601b 100644 (file)
--- a/archive-patches/timezone.xml
+++ b/archive-patches/timezone.xml
@@ -1,88 +1,89 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-
+<!-- internal enigma2 version -->
 <timezone>
-       <zone name="(GMT-12:00) International Date Line West" zone="Kwajalein" />
-       <zone name="(GMT-11:00) Midway Island, Samoa" zone="Midway" />
-       <zone name="(GMT-10:00) Hawaii" zone="Honolulu" />
-       <zone name="(GMT-09:00) Alaska" zone="Anchorage" />
-       <zone name="(GMT-08:00) Pacific Time (US and Canada), Tijuana" zone="Tijuana" />
+       <zone name="(GMT-12:00) International Date Line West" zone="Pacific/Kwajalein" />
+       <zone name="(GMT-11:00) Midway Island, Samoa" zone="Pacific/Midway" />
+       <zone name="(GMT-10:00) Hawaii" zone="Pacific/Honolulu" />
+       <zone name="(GMT-09:00) Alaska" zone="America/Anchorage" />
+       <zone name="(GMT-08:00) Pacific Time (US and Canada), Tijuana" zone="America/Tijuana" />
        <zone name="(GMT-07:00) Arizona" zone="MST" />
        <zone name="(GMT-07:00) Chihuahua, La Paz, Mazatlan" zone="MST7MDT" />
        <zone name="(GMT-07:00) Mountain Time (US &amp; Canada) " zone="MST7MDT" />
        <zone name="(GMT-06:00) Central America" zone="CST6CDT" />
        <zone name="(GMT-06:00) Central Time (US and Canada)" zone="CST6CDT" />
        <zone name="(GMT-06:00) Guadalajara, Mexico City, Monterrey" zone="CST6CDT" />
-       <zone name="(GMT-06:00) Saskatchewan" zone="Saskatchewan" />
-       <zone name="(GMT-05:00) Bogota, Lima, Quito" zone="Bogota" />
+       <zone name="(GMT-06:00) Saskatchewan" zone="Canada/Saskatchewan" />
+       <zone name="(GMT-05:00) Bogota, Lima, Quito" zone="America/Bogota" />
        <zone name="(GMT-05:00) Eastern Time (Us and Canada)" zone="EST5EDT" />
        <zone name="(GMT-05:00) Indiana (East)" zone="EST" />
-       <zone name="(GMT-04:00) Atlantic Time (Canada)" zone="Halifax" />
-       <zone name="(GMT-04:00) Caracas, La Paz" zone="Caracas" />
-       <zone name="(GMT-04:00) Santiago" zone="Santiago" />
-       <zone name="(GMT-04:00) Brazil, West" zone="West" />
-       <zone name="(GMT-04:00) Brazil, Acre" zone="Acre" />
-       <zone name="(GMT-03:30) Newfoundland" zone="Newfoundland" />
-       <zone name="(GMT-03:00) Brazil, East" zone="East" />
-       <zone name="(GMT-03:00) Buenos Aires, Georgetown" zone="West" />
-       <zone name="(GMT-03:00) Greenland" zone="Danmarkshavn" />
-       <zone name="(GMT-02:00) Mid-Atlantic" zone="Noronha" />
-       <zone name="(GMT-02:00) Brazil, FNT" zone="DeNoronha" />
-       <zone name="(GMT-01:00) Azores" zone="Azores" />
-       <zone name="(GMT-01:00) Cape Verde Is." zone="Cape_Verde" />
-       <zone name="(GMT) Casablanca, Monrovia" zone="Casablanca" />
-       <zone name="(GMT) Greenwich Mean Time : Dublin, Lisbon, London" zone="Dublin" />
+       <zone name="(GMT-04:00) Atlantic Time (Canada)" zone="Canada/Atlantic" />
+       <zone name="(GMT-04:00) Caracas, La Paz" zone="America/Caracas" />
+       <zone name="(GMT-04:00) Santiago" zone="America/Santiago" />
+       <zone name="(GMT-04:00) Brazil, West" zone="Brazil/West" />
+       <zone name="(GMT-04:00) Brazil, Acre" zone="Brazil/Acre" />
+       <zone name="(GMT-03:30) Newfoundland" zone="Canada/Newfoundland" />
+       <zone name="(GMT-03:00) Brazil, East" zone="Brazil/East" />
+       <zone name="(GMT-03:00) Buenos Aires, Georgetown" zone="Brazil/West" />
+       <zone name="(GMT-03:00) Greenland" zone="America/Danmarkshavn" />
+       <zone name="(GMT-02:00) Mid-Atlantic" zone="America/Noronha" />
+       <zone name="(GMT-02:00) Brazil, FNT" zone="Brazil/DeNoronha" />
+       <zone name="(GMT-01:00) Azores" zone="Atlantic/Azores" />
+       <zone name="(GMT-01:00) Cape Verde Is." zone="Atlantic/Cape_Verde" />
+       <zone name="(GMT) Casablanca, Monrovia" zone="Africa/Casablanca" />
+       <zone name="(GMT) Greenwich Mean Time : Dublin, Lisbon, London" zone="Europe/Dublin" />
+       <zone name="(GMT+01:00) Algeria" zone="Africa/Algiers" />
        <zone name="(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna" zone="CET" />
        <zone name="(GMT+01:00) Belgrade, Bratislava, Budapest, Prague" zone="CET" />
        <zone name="(GMT+01:00) Brussels, Copenhagen, Madrid, Paris" zone="CET" />
        <zone name="(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb" zone="CET" />
-       <zone name="(GMT+01:00) West Central Africa" zone="Kinshasa" />
-       <zone name="(GMT+01:00) Algiers, Tunis" zone="Kinshasa" />
-       <zone name="(GMT+02:00) Athens, Istanbul" zone="Istanbul" />
-       <zone name="(GMT+02:00) Bucharest" zone="Istanbul" />
-       <zone name="(GMT+02:00) Harare, Pretoria" zone="Harare" />
-       <zone name="(GMT+02:00) Helsinki, Kyiv, Sofia" zone="Istanbul" />
-       <zone name="(GMT+02:00) Riga, Tallinn, Vilnius" zone="Istanbul" />
-       <zone name="(GMT+02:00) Jerusalem" zone="Jerusalem" />
-       <zone name="(GMT+03:00) Baghdad" zone="Baghdad" />
-       <zone name="(GMT+03:00) Kuwait, Riyadh" zone="Riyadh" />
-       <zone name="(GMT+03:00) Minsk" zone="Moscow" />
-       <zone name="(GMT+03:00) Moscow, St. Petersburg, Volgograd" zone="Moscow" />
-       <zone name="(GMT+03:00) Nairobi" zone="Nairobi" />
-       <zone name="(GMT+03:30) Tehran" zone="Tehran" />
-       <zone name="(GMT+04:00) Abu Dhabi, Muscat" zone="Muscat" />
-       <zone name="(GMT+04:00) Tbilisi, Yerevan" zone="Muscat" />
-       <zone name="(GMT+04:00) Samara" zone="Muscat" />
-       <zone name="(GMT+04:00) Baku" zone="Baku" />
-       <zone name="(GMT+04:30) Kabul" zone="Kabul" />
-       <zone name="(GMT+05:00) Ekaterinburg" zone="Tashkent" />
-       <zone name="(GMT+05:00) Islamabad, Karachi, Tashkent" zone="Tashkent" />
-       <zone name="(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi" zone="Calcutta" />
-       <zone name="(GMT+05:45) Kathmandu" zone="Katmandu" />
-       <zone name="(GMT+06:00) Almaty, Astana" zone="Almaty" />
-       <zone name="(GMT+06:00) Novosibirsk" zone="Omsk" />
-       <zone name="(GMT+06:00) Dhaka" zone="Dhaka" />
-       <zone name="(GMT+06:00) Sri Jayawardenepura" zone="Colombo" />
-       <zone name="(GMT+06:30) Rangoon" zone="Rangoon" />
-       <zone name="(GMT+07:00) Bangkok, Hanoi, Jakarta" zone="Bangkok" />
-       <zone name="(GMT+07:00) Krasnoyarsk" zone="Krasnoyarsk" />
-       <zone name="(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" zone="Hong_Kong" />
-       <zone name="(GMT+08:00) Irkutsk, Ulaan Bataar" zone="Irkutsk" />
-       <zone name="(GMT+08:00) Kuala Lumpur, Singapore" zone="Kuala_Lumpur" />
-       <zone name="(GMT+08:00) Perth" zone="Perth" />
-       <zone name="(GMT+08:00) Taipei" zone="Taipei" />
-       <zone name="(GMT+09:00) Osaka, Sapporo, Tokyo" zone="Tokyo" />
-       <zone name="(GMT+09:00) Seoul" zone="Seoul" />
-       <zone name="(GMT+09:00) Yakutsk" zone="Yakutsk" />
-       <zone name="(GMT+09:30) Adelaide" zone="Adelaide" />
-       <zone name="(GMT+09:30) Darwin" zone="Darwin" />
-       <zone name="(GMT+10:00) Brisbane" zone="Brisbane" />
-       <zone name="(GMT+10:00) Canberra, Melbourne, Sydney" zone="Sydney" />
-       <zone name="(GMT+10:00) Guam, Port Moresby" zone="Guam" />
-       <zone name="(GMT+10:00) Hobart" zone="Hobart" />
-       <zone name="(GMT+10:00) Vladivostok" zone="Vladivostok" />
-       <zone name="(GMT+11:00) Magadan, Solomon Is., New Caledonia" zone="Magadan" />
-       <zone name="(GMT+11:30) Norfolk Island" zone="Norfolk" />
-       <zone name="(GMT+12:00) Auckland, Wellington" zone="Auckland" />
-       <zone name="(GMT+12:00) Fiji, Kamchatka, Marshall Is." zone="Fiji" />
-       <zone name="(GMT+13:00) Nukualofa" zone="Tongatapu" />
+       <zone name="(GMT+01:00) West Central Africa" zone="Africa/Kinshasa" />
+       <zone name="(GMT+02:00) Athens" zone="Europe/Athens" />
+       <zone name="(GMT+02:00) Istanbul" zone="Europe/Istanbul" />
+       <zone name="(GMT+02:00) Minsk" zone="Europe/Minsk" />
+       <zone name="(GMT+02:00) Bucharest" zone="Europe/Bucharest" />
+       <zone name="(GMT+02:00) Harare, Pretoria" zone="Africa/Harare" />
+       <zone name="(GMT+02:00) Helsinki, Kyiv, Sofia" zone="Europe/Helsinki" />
+       <zone name="(GMT+02:00) Riga, Tallinn, Vilnius" zone="Europe/Riga" />
+       <zone name="(GMT+02:00) Jerusalem" zone="Asia/Jerusalem" />
+       <zone name="(GMT+03:00) Baghdad" zone="Asia/Baghdad" />
+       <zone name="(GMT+03:00) Kuwait, Riyadh" zone="Asia/Riyadh" />
+       <zone name="(GMT+03:00) Moscow, St. Petersburg, Volgograd" zone="Europe/Moscow" />
+       <zone name="(GMT+03:00) Nairobi" zone="Africa/Nairobi" />
+       <zone name="(GMT+03:30) Tehran" zone="Asia/Tehran" />
+       <zone name="(GMT+04:00) Abu Dhabi, Muscat" zone="Asia/Muscat" />
+       <zone name="(GMT+04:00) Tbilisi, Yerevan" zone="Asia/Muscat" />
+       <zone name="(GMT+04:00) Samara" zone="Europe/Samara" />
+       <zone name="(GMT+04:00) Baku" zone="Asia/Baku" />
+       <zone name="(GMT+04:30) Kabul" zone="Asia/Kabul" />
+       <zone name="(GMT+05:00) Ekaterinburg" zone="Asia/Yekaterinburg" />
+       <zone name="(GMT+05:00) Islamabad, Karachi, Tashkent" zone="Asia/Tashkent" />
+       <zone name="(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi" zone="Asia/Calcutta" />
+       <zone name="(GMT+05:45) Kathmandu" zone="Asia/Katmandu" />
+       <zone name="(GMT+06:00) Almaty" zone="Asia/Almaty" />
+       <zone name="(GMT+06:00) Novosibirsk" zone="Asia/Novosibirsk" />
+       <zone name="(GMT+06:00) Astana, Dhaka" zone="Asia/Dhaka" />
+       <zone name="(GMT+06:00) Sri Jayawardenepura" zone="Asia/Colombo" />
+       <zone name="(GMT+06:30) Rangoon" zone="Asia/Rangoon" />
+       <zone name="(GMT+07:00) Bangkok, Hanoi, Jakarta" zone="Asia/Bangkok" />
+       <zone name="(GMT+07:00) Krasnoyarsk" zone="Asia/Krasnoyarsk" />
+       <zone name="(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" zone="Asia/Hong_Kong" />
+       <zone name="(GMT+08:00) Irkutsk, Ulaan Bataar" zone="Asia/Irkutsk" />
+       <zone name="(GMT+08:00) Kuala Lumpur, Singapore" zone="Asia/Kuala_Lumpur" />
+       <zone name="(GMT+08:00) Perth" zone="Australia/Perth" />
+       <zone name="(GMT+08:00) Taipei" zone="Asia/Taipei" />
+       <zone name="(GMT+09:00) Osaka, Sapporo, Tokyo" zone="Asia/Tokyo" />
+       <zone name="(GMT+09:00) Seoul" zone="Asia/Seoul" />
+       <zone name="(GMT+09:00) Yakutsk" zone="Asia/Yakutsk" />
+       <zone name="(GMT+09:30) Adelaide" zone="Australia/Adelaide" />
+       <zone name="(GMT+09:30) Darwin" zone="Australia/Darwin" />
+       <zone name="(GMT+10:00) Brisbane" zone="Australia/Brisbane" />
+       <zone name="(GMT+10:00) Canberra, Melbourne, Sydney" zone="Australia/Sydney" />
+       <zone name="(GMT+10:00) Guam, Port Moresby" zone="Pacific/Guam" />
+       <zone name="(GMT+10:00) Hobart" zone="Australia/Hobart" />
+       <zone name="(GMT+10:00) Vladivostok" zone="Asia/Vladivostok" />
+       <zone name="(GMT+11:00) Magadan, Solomon Is., New Caledonia" zone="Asia/Magadan" />
+       <zone name="(GMT+11:30) Norfolk Island" zone="Pacific/Norfolk" />
+       <zone name="(GMT+12:00) Auckland, Wellington" zone="Pacific/Auckland" />
+       <zone name="(GMT+12:00) Fiji, Kamchatka, Marshall Is." zone="Pacific/Fiji" />
+       <zone name="(GMT+13:00) Nukualofa" zone="Pacific/Tongatapu" />
 </timezone>

diff --git a/make/archives.mk b/make/archives.mk
index 29729483c43aa37085b1fff3370bea0e7c5e6865..05e20ae20084acd5747437f6a956cfc03da377e1 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -387,8 +387,8 @@ $(ARCHIVE)/unfs3-$(UNFS3_VER).tar.gz:
 $(ARCHIVE)/hd-idle-$(HD_IDLE_VER).tgz:
        $(WGET) http://downloads.sourceforge.net/project/hd-idle/hd-idle-$(HD_IDLE_VER).tgz
 
-$(ARCHIVE)/tzdata$(TZ_VER).tar.gz:
-       $(WGET) ftp://ftp.iana.org/tz/releases/tzdata$(TZ_VER).tar.gz
+$(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz:
+       $(WGET) ftp://ftp.iana.org/tz/releases/tzdata$(TZDATA_VER).tar.gz
 
 $(ARCHIVE)/u-boot-$(U-BOOT_VER).tar.bz2:
        $(WGET) ftp://ftp.denx.de/pub/u-boot/u-boot-$(U-BOOT_VER).tar.bz2

diff --git a/make/libraries.mk b/make/libraries.mk
index 66946e09c2d67257c243c6b9db4ad1386170c593..77c05f2931d81360a511c3805e9af9089a8d92b1 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1345,23 +1345,32 @@ $(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGETPREFIX)
        $(REMOVE)/lzo-$(LZO_VER)
        $(TOUCH)
 
-$(D)/timezone: $(ARCHIVE)/tzdata$(TZ_VER).tar.gz | find-zic $(TARGETPREFIX)
+
+TZDATA_ZONELIST = \
+       africa antarctica asia australasia europe northamerica \
+       southamerica etcetera backward factory
+
+$(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | find-zic $(TARGETPREFIX)
        $(START_BUILD)
        mkdir -p $(BUILD_TMP)/timezone $(BUILD_TMP)/timezone/zoneinfo
-       tar -C $(BUILD_TMP)/timezone -xf $(ARCHIVE)/tzdata$(TZ_VER).tar.gz
+       tar -C $(BUILD_TMP)/timezone -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz
        set -e; cd $(BUILD_TMP)/timezone; \
                unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \
-               zic -d zoneinfo.tmp \
-                       europe; \
+               zic -d zoneinfo.tmp $(TZDATA_ZONELIST); \
                sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(PATCHES)/timezone.xml | sort -u | \
                while read x; do \
-                       find zoneinfo.tmp -type f -name $$x | sort | \
+                       echo $$x; \
+                       country=`echo $$x | grep "/" | sed -e 's!\(.*\)/.*!\1!'`; \
+                       [ -n $$country ] &&     mkdir -p zoneinfo/$$country; \
+                       city=`echo $$x | sed -e "s/.*[\/]//"`; \
+                       echo -e "  Country = $$country\n  City    = $$city\n------------------"; \
+                       find zoneinfo.tmp -type f -name $$city | sort | \
                        while read y; do \
-                               cp -a $$y zoneinfo/$$x; \
+                               cp -a zoneinfo.tmp/$$x zoneinfo/$$x; \
                        done; \
                        test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \
                done; \
-               cp -a zoneinfo $(TARGETPREFIX)/share/
+               cp -ar zoneinfo $(TARGETPREFIX)/share/
        install -m 0644 $(PATCHES)/timezone.xml $(TARGETPREFIX)/etc/
        $(REMOVE)/timezone
        $(TOUCH)

diff --git a/make/versions.mk b/make/versions.mk
index 0322e7f3106af7bfacf8c465a4d61294ddb8f22b..93d686c7160997feaa8cb9533c1b4757e7246921 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -262,7 +262,7 @@ SAMBA36_VER = 3.6.25
 SQLITE_VER = 3160100
 
 # timezone files
-TZ_VER=2017b
+TZDATA_VER=2022f
 
 # u-boot; an universal boot loader
 U-BOOT_VER=2014.04