From 5a6a8c3d6f8cb71bbede9c6237df97a80143e0c6 Mon Sep 17 00:00:00 2001 From: Vladimir Ulrich Date: Sat, 25 Sep 2021 22:17:18 +0300 Subject: [PATCH] zoneinfo: Updated to the latest release Signed-off-by: Vladimir Ulrich (cherry picked from commit 7259eea63fcbeb0955c8f390562c88590a3e1ae7) (cherry picked from commit 00f1c78a647c5b1ddc8347d0bacbfdec3c743536) (cherry picked from commit 453be8f179e78a00048deff746e74244b39f7ad8) (cherry picked from commit 3185feda499ab68ca463696c0e673d8056ec4429) (cherry picked from commit b15721d6d64686933cf982c9fe303845565a1bc0) (cherry picked from commit cb5bf2b007940c14825dc734814bfe5ceae5b09f) (cherry picked from commit 89c2fa9d9b5cd8f6e1cf9859965de04b3707fa5a) (cherry picked from commit 8d693a79bedd8a4bf00c2e14f43b0c95ec950155) (cherry picked from commit 5a9e8698c94fcfa14ab6a0c314881eb4be1d47c7) Updated zoneinfo-all meta-package to fix warnings on build Removed zoneinfo-simple from dependencies of zoneinfo-all as its contents are included in other packages. (cherry picked from commit 1d88250815b5efe623bb01a591c4ca651c8f5600) (cherry picked from commit 23e6200e4d0a435915ab4ef9700a7297e89b68b3) (cherry picked from commit 0ff1a8666be7cc3ebde5838c4b166a2438f87567) --- utils/zoneinfo/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile index 469d761c3a..7608fcef65 100644 --- a/utils/zoneinfo/Makefile +++ b/utils/zoneinfo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2021 OpenWrt.org +# Copyright (C) 2007-2023 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zoneinfo -PKG_VERSION:=2021a +PKG_VERSION:=2023c PKG_RELEASE:=1 #As i couldn't find real license used "Public Domain" @@ -19,14 +19,14 @@ PKG_LICENSE:=Public Domain PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz PKG_SOURCE_CODE:=tzcode$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases -PKG_HASH:=39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08 +PKG_HASH:=3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c include $(INCLUDE_DIR)/package.mk define Download/tzcode FILE=$(PKG_SOURCE_CODE) URL=$(PKG_SOURCE_URL) - HASH:=eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0 + HASH:=46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7 endef $(eval $(call Download,tzcode)) @@ -103,7 +103,6 @@ define Package/zoneinfo-all $(call Package/zoneinfo/Default) TITLE:=Zone Information (all zones) DEPENDS:= \ - +zoneinfo-simple \ +zoneinfo-core \ +zoneinfo-africa \ +zoneinfo-northamerica \ @@ -147,6 +146,10 @@ define Package/zoneinfo-core/install done endef +define Package/zoneinfo-all/install + : +endef + define Package/zoneinfo-simple/install $(INSTALL_DIR) $(1)/usr/share/zoneinfo for i in Pacific/Honolulu \