X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftzdata;h=c36b7a34f64b75720d1a5c71701b9e84191a63d9;hp=2aa4064e816739ab016f784d1a9a9ee12b3bf6e7;hb=fc84e6ec23f824f6a72935c0d274ac4fe948f0a0;hpb=51537b2aa8802586e6401785081b7f1fe6f39863

diff --git a/lfs/tzdata b/lfs/tzdata
index 2aa4064e8..c36b7a34f 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,29 +24,29 @@
 
 include Config
 
-VER        = 2011n
-TZDATA_VER = 2011n
-TZCODE_VER = 2011i
+VER        = 2014a
+TZDATA_VER = $(VER)
+TZCODE_VER = $(VER)
 
-THISAPP    = tzdata
-DL_FILE    = tzdata-base-0.tar.bz2
+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
 ###############################################################################
 
-objects = $(DL_FILE) tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
+objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
 
-$(DL_FILE)_MD5 = e36d2f742c22f8c8dbf0686ac9769b55
-tzdata$(TZDATA_VER).tar.gz_MD5 = 20dbfb28efa008ddbf6dd34601ea40fa
-tzcode$(TZCODE_VER).tar.gz_MD5 = cf7f4335b7c8682899fa2814e711c1b2
+tzdata$(TZDATA_VER).tar.gz_MD5 = 423a11bcffc10dda578058cf1587d048
+tzcode$(TZCODE_VER).tar.gz_MD5 = 77ccbb720f0f2076f12dff6ded70eb98
 
 install : $(TARGET)
 
@@ -75,19 +75,26 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && mkdir -pv $(DIR_APP)
 	mkdir -pv $(DIR_APP)/tzdata$(TZDATA_VER) $(DIR_APP)/tzcode$(TZCODE_VER)
-	tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)/tzdata$(TZDATA_VER)
-	tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)/tzcode$(TZCODE_VER)
+	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) && 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)
 
-	cd $(DIR_APP) && sed -e 's|@objpfx@|$(DIR_APP)/obj/|' \
-		-e 's|@datadir@|/usr/share|' \
-		Makeconfig.in > Makeconfig
-	cd $(DIR_APP) && make $(MAKETUNING)
+	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
 
-	cd $(DIR_APP) && sed -i 's|@install_root@||' Makeconfig
-	cd $(DIR_APP) && make install
+	rm -vf /usr/share/zoneinfo/localtime
+	cp -vf /usr/share/zoneinfo/GMT /etc/localtime
 
-	cp -f /usr/share/zoneinfo/GMT /etc/localtime
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)