From 92dce0484d48b451a4bc04912ba1a42ec6f2a339 Mon Sep 17 00:00:00 2001 From: Markham Date: Fri, 4 Nov 2022 22:30:13 +0100 Subject: [PATCH] bump version tzdata20222f and timezone stuff --- archive-patches/timezone.xml | 147 ++++++++++++++++++----------------- make/archives.mk | 4 +- make/libraries.mk | 23 ++++-- make/versions.mk | 2 +- 4 files changed, 93 insertions(+), 83 deletions(-) diff --git a/archive-patches/timezone.xml b/archive-patches/timezone.xml index e0e7c9f..403cabc 100644 --- a/archive-patches/timezone.xml +++ b/archive-patches/timezone.xml @@ -1,88 +1,89 @@ - + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/make/archives.mk b/make/archives.mk index 2972948..05e20ae 100755 --- 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 66946e0..77c05f2 100755 --- 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 0322e7f..93d686c 100644 --- 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 -- 2.39.5