| Message ID | 20210110164711.1708062-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/zic: bump version to 2020f | expand |
Bernd, All, On 2021-01-10 17:47 +0100, Bernd Kuhls spake thusly: > Release notes: > https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html > > Rebased patch. > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Series of two patches applied to master, thanks. However, I did notice an annoying warning when zic is called: warning: -y ignored And indeed, in the release notes of 2020b you point to, the -y option was removed from zic, and the yearistype.sh script was removed from tzdata. I was not careful enough when I applied your previous bump, so I took the burden of fixing it: https://git.buildroot.org/buildroot/commit/?id=7f78eef767baaeab7bbc008c599027a77b6d3169 /me whips himself for his typo... Regards, Yann E. MORIN. > --- > .../0001-remove-dependency-check-on-version-file.patch | 8 ++++---- > package/zic/zic.hash | 4 ++-- > package/zic/zic.mk | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch > index f4b2590525..193c263049 100644 > --- a/package/zic/0001-remove-dependency-check-on-version-file.patch > +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch > @@ -18,10 +18,10 @@ diff --git a/Makefile b/Makefile > index 1b714a8..00d2c09 100644 > --- a/Makefile > +++ b/Makefile > -@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 > - cp date $(DESTDIR)$(BINDIR)/. > - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. > - > +@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 > + # Otherwise, use $(VERSION) unless it is "unknown" and there is already > + # a 'version' file, in which case reuse the existing 'version' contents > + # and append "-dirty" if the contents do not already end in "-dirty". > -version: $(VERSION_DEPS) > +version: > { (type git) >/dev/null 2>&1 && \ > diff --git a/package/zic/zic.hash b/package/zic/zic.hash > index 677bb0f059..3cee80bcdd 100644 > --- a/package/zic/zic.hash > +++ b/package/zic/zic.hash > @@ -1,4 +1,4 @@ > -# From https://mm.icann.org/pipermail/tz-announce/2020-April/000058.html > -sha512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 tzcode2020a.tar.gz > +# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html > +sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz > # Locally computed: > sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE > diff --git a/package/zic/zic.mk b/package/zic/zic.mk > index 98f3bca58b..7529b682a2 100644 > --- a/package/zic/zic.mk > +++ b/package/zic/zic.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ZIC_VERSION = 2020a > +ZIC_VERSION = 2020f > ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz > ZIC_SITE = https://www.iana.org/time-zones/repository/releases > ZIC_STRIP_COMPONENTS = 0 > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Release notes: > https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html > Rebased patch. > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2020.02.x and 2020.11.x, thanks.
diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index f4b2590525..193c263049 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,10 +18,10 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 - cp date $(DESTDIR)$(BINDIR)/. - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. - +@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 + # Otherwise, use $(VERSION) unless it is "unknown" and there is already + # a 'version' file, in which case reuse the existing 'version' contents + # and append "-dirty" if the contents do not already end in "-dirty". -version: $(VERSION_DEPS) +version: { (type git) >/dev/null 2>&1 && \ diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 677bb0f059..3cee80bcdd 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-April/000058.html -sha512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 tzcode2020a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html +sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 98f3bca58b..7529b682a2 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2020a +ZIC_VERSION = 2020f ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0
Release notes: https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html Rebased patch. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../0001-remove-dependency-check-on-version-file.patch | 8 ++++---- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)