Browse Source

tzdata: Updated (2017b -> 2020d)

We need to consider the modofication of the conf file
most probably if we build tzdata with the new tzdata
the modifiaction of the conf file is not needed anymore
CHECK!!!
tc-work-musl-mess
Nagy Károly Gábriel 5 years ago
parent
commit
8b13214c38
Signed by: karasz GPG Key ID: C6BA1070A8CBDA0C
3 changed files with 16 additions and 16 deletions
  1. +10
    -10
      base/tzdata/no-update-localtime.patch
  2. +2
    -2
      base/tzdata/tzdata.conf
  3. +4
    -4
      base/tzdata/tzdata.desc

+ 10
- 10
base/tzdata/no-update-localtime.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../tzdata/no-update-localtime.patch
# Copyright (C) 2016 The OpenSDE Project
# Copyright (C) 2016 - 2020 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -19,13 +19,13 @@ don't touch /etc/localtime
--- ./Makefile.orig 2016-05-10 13:30:29.795286175 +0300
+++ ./Makefile 2016-05-10 13:41:17.395286175 +0300
@@ -394,7 +394,7 @@
$(DESTDIR)$(LIBDIR) \
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
$(DESTDIR)$(MANDIR)/man8
- $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
+ $(ZIC_INSTALL) -p $(POSIXRULES)
cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
cp libtz.a $(DESTDIR)$(LIBDIR)/.
@@ -564,7 +564,7 @@
'$(DESTDIR)$(LIBDIR)' \
'$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
'$(DESTDIR)$(MANDIR)/man8'
- $(ZIC_INSTALL) -l $(LOCALTIME) \
+ $(ZIC_INSTALL) \
`case '$(POSIXRULES)' in ?*) echo '-p';; esac \
` $(POSIXRULES) \
-t '$(DESTDIR)$(TZDEFAULT)'

+ 2
- 2
base/tzdata/tzdata.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../tzdata/tzdata.conf
# Copyright (C) 2008 - 2013 The OpenSDE Project
# Copyright (C) 2008 - 2020 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -31,7 +31,7 @@ tzdata_extract() {
# they add some options when setting CC in the Makefile, we have to override $(cc)
makeopt="cc=$CC CFLAGS="-std=gnu99" AWK=$AWK RANLIB=$RANLIB"
# use `zic` from the PATH, instead of the just compiled one
var_append makeopt ' ' 'zic=zic'
#var_append makeopt ' ' 'zic=zic'
var_append makeopt ' ' "TOPDIR=/$prefix"
var_append makeopt ' ' "ETCDIR=$sbindir" # no, this is not a typo

+ 4
- 4
base/tzdata/tzdata.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../tzdata/tzdata.desc
[COPY] Copyright (C) 2008 - 2017 The OpenSDE Project
[COPY] Copyright (C) 2008 - 2020 The OpenSDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
[COPY]
@ -29,10 +29,10 @@
[L] PublicDomain
[S] Stable
[V] 2017b
[V] 2020d
[P] X -1---5---9 120.000
[CV-URL] http://www.iana.org/time-zones
[D] 3490653150 tzcode2017b.tar.gz http://www.iana.org/time-zones/repository/releases/
[D] 3941765786 tzdata2017b.tar.gz http://www.iana.org/time-zones/repository/releases/
[D] 1354026632 tzcode2020d.tar.gz http://www.iana.org/time-zones/repository/releases/
[D] 1003229140 tzdata2020d.tar.gz http://www.iana.org/time-zones/repository/releases/

Loading…
Cancel
Save