package/zic: bump version to 2020f
PATCH 1/2 package/zic: bump version to 2020f
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
Rebased patch.
--- .../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(-)
package/zic/0001-remove-dependency-check-on-version-file.patch +4 -4
@@ -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 && \
package/zic/zic.hash +2 -2
@@ -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
package/zic/zic.mk +1 -1
@@ -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
Signature · 1 line
2.29.2
PATCH 2/2 package/tzdata: bump version to 2020f
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
Upstream removed timezones pacificnew and systemv:
https://mm.icann.org/pipermail/tz-announce/2020-October/000059.html
--- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/tzdata/tzdata.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-April/000058.html -sha512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d tzdata2020a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html +sha512 dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca tzdata2020f.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE
package/tzdata/tzdata.mk +2 -2
@@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2020a +TZDATA_VERSION = 2020f TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0
@@ -17,7 +17,7 @@ TZDATA_LICENSE_FILES = LICENSE # dependencies TZDATA_DEFAULT_ZONELIST = \ africa antarctica asia australasia europe northamerica \ - southamerica pacificnew etcetera backward systemv factory + southamerica etcetera backward factory ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default) TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST)
Signature · 1 line
2.29.2
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.htmlUpstream removed timezones pacificnew and systemv:
https://mm.icann.org/pipermail/tz-announce/2020-October/000059.htmlSigned-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/tzdata: bump version to 2020f
Hello,
Le 12/01/2021 ? 18:40, Peter Korsgaard a ?crit?:
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
Quoted 7 lines
Quoted 4 lines
Upstream removed timezones pacificnew and systemv:
https://mm.icann.org/pipermail/tz-announce/2020-October/000059.htmlSigned-off-by Bernd Kuhls <[email protected]>Committed to 2020.02.x and 2020.11.x, thanks.
This version bump seems introduce a regression in the Buildroot testsuite for timezone tests TestGlibcAllTimezone and TestGlibcNonDefaultLimitedTimezone.
See:
https://gitlab.com/buildroot.org/buildroot/-/pipelines/253940390/failures
The Buildroot configuration was:
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="northamerica"
BR2_TARGET_LOCALTIME="America/New_York"
And the test is checking "date" output:
tz, _ = self.emulator.run("date +%Z")
self.assertEqual(tz[0].strip(), "EST")
tz, _ = self.emulator.run("TZ=UTC date +%Z")
self.assertEqual(tz[0].strip(), "UTC")
tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z")
self.assertEqual(tz[0].strip(), "PST")
tz, _ = self.emulator.run("TZ=Europe/Paris date +%Z")
self.assertEqual(tz[0].strip(), "Europe")This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Best regards,
Romain
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 42 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hello,
Le 12/01/2021 ? 18:40, Peter Korsgaard a ?crit?:Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.htmlQuoted 7 lines
Quoted 4 lines
Upstream removed timezones pacificnew and systemv:
https://mm.icann.org/pipermail/tz-announce/2020-October/000059.htmlSigned-off-by Bernd Kuhls <[email protected]>Committed to 2020.02.x and 2020.11.x, thanks.
This version bump seems introduce a regression in the Buildroot testsuite for timezone tests TestGlibcAllTimezone and TestGlibcNonDefaultLimitedTimezone.
See:
https://gitlab.com/buildroot.org/buildroot/-/pipelines/253940390/failuresThe Buildroot configuration was:
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="northamerica"
BR2_TARGET_LOCALTIME="America/New_York"And the test is checking "date" output:
tz, _ = self.emulator.run("date +%Z") self.assertEqual(tz[0].strip(), "EST") tz, _ = self.emulator.run("TZ=UTC date +%Z") self.assertEqual(tz[0].strip(), "UTC") tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z") self.assertEqual(tz[0].strip(), "PST") tz, _ = self.emulator.run("TZ=Europe/Paris date +%Z") self.assertEqual(tz[0].strip(), "Europe")
Quoted 2 lines
This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Are you able to reproduce it? When I gave it a quick test here I got sensible output from date.
But maybe I missed something?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/tzdata: bump version to 2020f
Hello Peter,
Le 14/02/2021 ? 16:30, Peter Korsgaard a ?crit?:
Quoted 42 lines
Quoted 41 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hello,
Le 12/01/2021 ? 18:40, Peter Korsgaard a ?crit?:Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.htmlQuoted 7 lines
Quoted 4 lines
Upstream removed timezones pacificnew and systemv:
https://mm.icann.org/pipermail/tz-announce/2020-October/000059.htmlSigned-off-by Bernd Kuhls <[email protected]>Committed to 2020.02.x and 2020.11.x, thanks.
This version bump seems introduce a regression in the Buildroot testsuite for timezone tests TestGlibcAllTimezone and TestGlibcNonDefaultLimitedTimezone.
See:
https://gitlab.com/buildroot.org/buildroot/-/pipelines/253940390/failuresThe Buildroot configuration was:
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="northamerica"
BR2_TARGET_LOCALTIME="America/New_York"And the test is checking "date" output:
tz, _ = self.emulator.run("date +%Z") self.assertEqual(tz[0].strip(), "EST") tz, _ = self.emulator.run("TZ=UTC date +%Z") self.assertEqual(tz[0].strip(), "UTC") tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z") self.assertEqual(tz[0].strip(), "PST") tz, _ = self.emulator.run("TZ=Europe/Paris date +%Z") self.assertEqual(tz[0].strip(), "Europe")
Quoted 8 lines
Quoted 2 lines
This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Are you able to reproduce it? When I gave it a quick test here I got sensible output from date.
But maybe I missed something?
Yes, I tried on master, 2020.02.x, 2020.11.x and 2020.02.9 and 2020.11.1 (before the version bump).
I'm looking at it but I don't have a patch yet.
Best regards,
Romain
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hi,
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Are you able to reproduce it? When I gave it a quick test here I got sensible output from date.
Quoted 6 lines
Quoted 1 line
But maybe I missed something?
Yes, I tried on master, 2020.02.x, 2020.11.x and 2020.02.9 and 2020.11.1 (before the version bump).
I'm looking at it but I don't have a patch yet.
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 12 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hi,
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Are you able to reproduce it? When I gave it a quick test here I got sensible output from date.
But maybe I missed something?
Quoted 8 lines
Quoted 4 lines
Yes, I tried on master, 2020.02.x, 2020.11.x and 2020.02.9 and 2020.11.1 (before the version bump).
I'm looking at it but I don't have a patch yet.
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
No, the issue is with zic that is not generating proper Tzif2 files (the tzif2 header is there twice).
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/tzdata: bump version to 2020f
Le 14/02/2021 ? 19:21, Alexandre Belloni a ?crit?:
Quoted 16 lines · Peter Korsgaard
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hi,
Quoted 10 lines
Quoted 7 lines
Quoted 2 lines
This patch has been backported to stable version 2020.11.2 and 2020.02.10. Can you have a look?
Are you able to reproduce it? When I gave it a quick test here I got sensible output from date.
But maybe I missed something?
Yes, I tried on master, 2020.02.x, 2020.11.x and 2020.02.9 and 2020.11.1 (before the version bump).
Quoted 10 lines
Quoted 5 lines
Quoted 1 line
I'm looking at it but I don't have a patch yet.
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
No, the issue is with zic that is not generating proper Tzif2 files (the tzif2 header is there twice).
The issue happen on Glibc toolchain.
I added back the previous default zic format "fat" instead of "slim" [1] to pass the test. The default format has been changed in 2020b release.
I'm not sure if we should keep the "fat" format...
[1] https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
Best regards,
Romain
PATCH 2/2 package/tzdata: bump version to 2020f
On 2021-02-14 19:35 +0100, Romain Naour spake thusly:
Quoted 8 lines
Le 14/02/2021 ? 19:21, Alexandre Belloni a ?crit?:
Quoted 6 lines · Peter Korsgaard
Quoted 3 lines
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
No, the issue is with zic that is not generating proper Tzif2 files (the tzif2 header is there twice).
The issue happen on Glibc toolchain.
The issues *also* happends on uClibc toolchains (as reported on IRC), and I suspect it also happens on musl toolchains (as it uses the same tzdata and zic as for glibc).
And Alexandre investigated quickly a few days ago, and reported on IRC (quoting):
01:01 < abelloni> mcon: temporary workaround, you can revert 7868289fd53480201f8be7b72097246b7923611c. 01:02 < abelloni> y_morin: ^
01:02 < abelloni> y_morin: since the bump the zic output has two TZif2 headers, this breaks tzdump 01:03 < abelloni> maybe this also break glibc, I didn't check yet
So it looks like the duplicated header is causing issues everywhere...
Quoted 4 lines
I added back the previous default zic format "fat" instead of "slim" [1] to pass the test. The default format has been changed in 2020b release.
I'm not sure if we should keep the "fat" format...
[1] https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
From this, it looks like the 'fat' format is not 2038-safe, while the 'slim' one is.
To be noted: the glibc version used in thoses tests is 2.18, released in August 2013...
It seems the support for the slim format was only introduced with glibc 2.32. 2.31 has no mention of either slim or fat, while 2.32 mention both, as it synced with upstream tz 2020a; the previous sync was with 2018i...
So, what I suggest we do:
- for master (and next): revert to fat for external glibc, use slim for internal glibc (check for c-sky)
- for maintenance branches: unconditionally revert to fat.
Thoughts?
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/tzdata: bump version to 2020f
Le 14/02/2021 ? 21:35, Yann E. MORIN a ?crit?:
Quoted 6 lines
On 2021-02-14 19:35 +0100, Romain Naour spake thusly:
Quoted 5 lines
Le 14/02/2021 ? 19:21, Alexandre Belloni a ?crit?:
Quoted 4 lines · Peter Korsgaard
Quoted 3 lines
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
No, the issue is with zic that is not generating proper Tzif2 files (the tzif2 header is there twice).
The issue happen on Glibc toolchain.
The issues *also* happends on uClibc toolchains (as reported on IRC), and I suspect it also happens on musl toolchains (as it uses the same tzdata and zic as for glibc).
Ok good to know!
Quoted 16 lines
And Alexandre investigated quickly a few days ago, and reported on IRC (quoting):
01:01 < abelloni> mcon: temporary workaround, you can revert
7868289fd53480201f8be7b72097246b7923611c. 01:02 < abelloni>y_morin: ^
01:02 < abelloni>y_morin: since the bump the zic output has two TZif2 headers, this breaks tzdump 01:03 < abelloni> maybe this also break glibc, I didn't check yetSo it looks like the duplicated header is causing issues everywhere...
Quoted 4 lines
I added back the previous default zic format "fat" instead of "slim" [1] to pass the test. The default format has been changed in 2020b release.
I'm not sure if we should keep the "fat" format...
[1] https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
Quoted 5 lines
From this, it looks like the 'fat' format is not 2038-safe, while the 'slim' one is.
To be noted: the glibc version used in thoses tests is 2.18, released in August 2013...
Yes, the codesourcery toolchain is really old and maybe we should stop using it. I believe we should focus on recent toolchain testing in the autobuilders with stable or bleeding-edge Bootlin prebuilt toolchain.
But this is another topic :)
Quoted 5 lines
It seems the support for the slim format was only introduced with glibc 2.32. 2.31 has no mention of either slim or fat, while 2.32 mention both, as it synced with upstream tz 2020a; the previous sync was with 2018i...
The slim support has been added in zic with 2019b release:
https://github.com/eggert/tz/commit/7879a3fba1310da0ccc1c336515b5b4a409c3ccb
Quoted 5 lines
So, what I suggest we do:
- for master (and next): revert to fat for external glibc, use slim for internal glibc (check for c-sky)
What's the plan to support slim format ?
Quoted 2 lines
- for maintenance branches: unconditionally revert to fat.
OK
Best regards,
Romain
Quoted 6 lines
Thoughts?
Regards,
Yann E. MORIN.
PATCH 2/2 package/tzdata: bump version to 2020f
In reply to Yann E. MORINQuoted 40 lines · Yann E. MORIN
On 2021-02-14 19:35 +0100, Romain Naour spake thusly:
Quoted 8 lines
Le 14/02/2021 ? 19:21, Alexandre Belloni a ?crit?:
Quoted 6 lines · Peter Korsgaard
Quoted 3 lines
Ok, thanks. There was a report on IRC that timezones on uClibc were broken as well because of an incompatibility between the new tzdata files and tzdump.
No, the issue is with zic that is not generating proper Tzif2 files (the tzif2 header is there twice).
The issue happen on Glibc toolchain.
The issues *also* happends on uClibc toolchains (as reported on IRC), and I suspect it also happens on musl toolchains (as it uses the same tzdata and zic as for glibc).
And Alexandre investigated quickly a few days ago, and reported on IRC (quoting):
01:01 < abelloni> mcon: temporary workaround, you can revert
7868289fd53480201f8be7b72097246b7923611c. 01:02 < abelloni>y_morin: ^
01:02 < abelloni>y_morin: since the bump the zic output has two TZif2 headers, this breaks tzdump 01:03 < abelloni> maybe this also break glibc, I didn't check yetSo it looks like the duplicated header is causing issues everywhere...
Quoted 4 lines
I added back the previous default zic format "fat" instead of "slim" [1] to pass the test. The default format has been changed in 2020b release.
I'm not sure if we should keep the "fat" format...
[1] https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3From this, it looks like the 'fat' format is not 2038-safe, while the 'slim' one is.
To be noted: the glibc version used in thoses tests is 2.18, released in August 2013...
It seems the support for the slim format was only introduced with glibc 2.32. 2.31 has no mention of either slim or fat, while 2.32 mention both, as it synced with upstream tz 2020a; the previous sync was with 2018i...
Quoted 9 lines
So, what I suggest we do:
- for master (and next): revert to fat for external glibc, use slim for internal glibc (check for c-sky)
- for maintenance branches: unconditionally revert to fat.
Thoughts?
I'll add that tzdump probably needs to be rewritten (or fixing but a rewrite is probably better) to handle the slim format, until then, you'd have to use the fat format for uclibc.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexandre" == Alexandre Belloni <[email protected]> writes:
Hi,
Quoted 3 lines
I'll add that tzdump probably needs to be rewritten (or fixing but a rewrite is probably better) to handle the slim format, until then, you'd have to use the fat format for uclibc.
Ok, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/tzdata: bump version to 2020f
In reply to Yann E. MORINQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Hi,
Quoted 6 lines
So it looks like the duplicated header is causing issues everywhere...
Quoted 4 lines
I added back the previous default zic format "fat" instead of "slim" [1] to pass the test. The default format has been changed in 2020b release.
I'm not sure if we should keep the "fat" format...
[1] https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
https://github.com/eggert/tz/commit/7879a3fba1310da0ccc1c336515b5b4a409c3ccb
(the commit adding the slim variant) gives more info.
Quoted 7 lines
To be noted: the glibc version used in thoses tests is 2.18, released in August 2013...
It seems the support for the slim format was only introduced with glibc 2.32. 2.31 has no mention of either slim or fat, while 2.32 mention both, as it synced with upstream tz 2020a; the previous sync was with 2018i...
It is also not clear to me exactly when the slim format support was added to glibc, but as additional datapoints, I have it working with a 2.30 based toolchain built by 2020.02.x and a 2.31 based one built by 2020.11.x.
Quoted 6 lines
So, what I suggest we do:
- for master (and next): revert to fat for external glibc, use slim for internal glibc (check for c-sky)
- for maintenance branches: unconditionally revert to fat.
Sounds sensible. Please do it in 2 patches, E.G. first use fat everywhere, and then as a followup patch change to slim for internal glibc.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/tzdata: bump version to 2020f
Hello,
Le lun. 15 f?vr. 2021 ? 10:12, Peter Korsgaard <[email protected]> a ?crit :
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Hi,
Quoted 3 lines
So it looks like the duplicated header is causing issues everywhere...
Quoted 1 line
I added back the previous default zic format "fat" instead of "slim"
[1] to pass
Quoted 3 lines
Quoted 3 lines
the test. The default format has been changed in 2020b release. I'm not sure if we should keep the "fat" format...
[1]https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
https://github.com/eggert/tz/commit/7879a3fba1310da0ccc1c336515b5b4a409c3ccb
(the commit adding the slim variant) gives more info.Quoted 7 lines
To be noted: the glibc version used in thoses tests is 2.18, released in August 2013...
It seems the support for the slim format was only introduced with glibc 2.32. 2.31 has no mention of either slim or fat, while 2.32 mention both, as it synced with upstream tz 2020a; the previous sync was with 2018i...
Quoted 5 lines
It is also not clear to me exactly when the slim format support was added to glibc, but as additional datapoints, I have it working with a 2.30 based toolchain built by 2020.02.x and a 2.31 based one built by 2020.11.x.
Actually we have the same issue with Bootlin armv5-eabi--glibc--bleeding-edge-2018.02-1 that use glibc 2.27 (tzcode 2017b).
There is no problem with glibc-2.28 (tzcode 2018g)
Romain
Quoted 9 lines
Quoted 8 lines
So, what I suggest we do:
- for master (and next): revert to fat for external glibc, use slim for internal glibc (check for c-sky)
Quoted 9 lines
Quoted 1 line
- for maintenance branches: unconditionally revert to fat.
Sounds sensible. Please do it in 2 patches, E.G. first use fat everywhere, and then as a followup patch change to slim for internal glibc.
--
Bye, Peter Korsgaard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210215/4dab82a2/attachment.html>
PATCH 2/2 package/tzdata: bump version to 2020f
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Hi,
Quoted 6 lines
Quoted 5 lines
It is also not clear to me exactly when the slim format support was added to glibc, but as additional datapoints, I have it working with a 2.30 based toolchain built by 2020.02.x and a 2.31 based one built by 2020.11.x.
Quoted 6 lines
Actually we have the same issue with Bootlin armv5-eabi--glibc--bleeding-edge-2018.02-1 that use glibc 2.27 (tzcode 2017b).
There is no problem with glibc-2.28 (tzcode 2018g)
Ahh, good catch. Then it is probably because of the addition of:
commit fc79706a3233b02909b1a75b1e43e40915eb5a04
Author: Florian Weimer <[email protected]> Date: Fri May 11 16:30:30 2018 +0200
time: Use 64-bit time values for time zone parsing
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/zic: bump version to 2020f
In reply to Bernd KuhlsBernd, All,
On 2021-01-10 17:47 +0100, Bernd Kuhls spake thusly:
Quoted 6 lines
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.htmlRebased patch.
Signed-off-by Bernd Kuhls <[email protected]>
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.
Quoted 56 lines
--- .../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(-)package/zic/0001-remove-dependency-check-on-version-file.patch +4
-4@@ -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 && \package/zic/zic.hash +2
-2@@ -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 LICENSEpackage/zic/zic.mk +1
-1@@ -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 = 0Signature · 6 lines
2.29.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 package/zic: bump version to 2020f
In reply to Bernd KuhlsQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://mm.icann.org/pipermail/tz-announce/2020-December/000064.htmlRebased patch.
Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard