package/tzdate: use classic 'fat' format for uClibc/glibc compatibility
PATCH 1/1 package/tzdate: use classic 'fat' format for uClibc/glibc compatibility
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1019385940
FAIL: test_run (tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/builds/buildroot.org/buildroot/support/testing/tests/core/test_timezone.py", line 66, in test_run
self.assertEqual(tz[0].strip(), "EST")
AssertionError: '' != 'EST'
Commit 7868289fd5348 (package/zic: bump version to 2020f) bumped the zic version to 2020f, which changed the default output format from the classic "fat" format to the new "slim" format:
https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
The slim format is unfortunately not supported by glibc < 2.28 or uClibc, so explicitly request the classic "fat" format.
--- package/tzdata/tzdata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/tzdata/tzdata.mk +2 -2
@@ -51,8 +51,8 @@ endef define HOST_TZDATA_BUILD_CMDS (cd $(@D); \ for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix $$zone || exit 1; \ - $(ZIC) -d _output/right -L leapseconds $$zone || exit 1; \ + $(ZIC) -b fat -d _output/posix $$zone || exit 1; \ + $(ZIC) -b fat -d _output/right -L leapseconds $$zone || exit 1; \ done; \ ) endef
Signature · 1 line
2.20.1
Arnout Vandecappelle
AppliedPATCH 1/1 package/tzdate: use classic 'fat' format for uClibc/glibc compatibility
Quoted 14 lines · Peter Korsgaard
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1019385940FAIL:
test_run(tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/builds/buildroot.org/buildroot/support/testing/tests/core/test_timezone.py", line 66, intest_runself.assertEqual(tz[0].strip(), "EST")AssertionError: '' != 'EST'
Commit
7868289fd5348(package/zic: bump version to 2020f) bumped the zic version to 2020f, which changed the default output format from the classic "fat" format to the new "slim" format:
Quoted 6 lines
https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
The slim format is unfortunately not supported by glibc < 2.28 or uClibc, so explicitly request the classic "fat" format.
Signed-off-by Peter Korsgaard <[email protected]>
Applied to master, thanks.
As mentioned in the other thread: at some point we will want to switch to the
slim format if the libc supports it. But that can be done later (and by someone who is motivated to do it :-).
Regards,
Arnout
Quoted 20 lines
--- package/tzdata/tzdata.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/tzdata/tzdata.mk +2
-2@@ -51,8 +51,8 @@ endef define HOST_TZDATA_BUILD_CMDS (cd $(@D); \ for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix $$zone || exit 1; \ - $(ZIC) -d _output/right -L leapseconds $$zone || exit 1; \ + $(ZIC) -b fat -d _output/posix $$zone || exit 1; \ + $(ZIC) -b fat -d _output/right -L leapseconds $$zone || exit 1; \ done; \ ) endef
PATCH 1/1 package/tzdate: use classic 'fat' format for uClibc/glibc compatibility
In reply to Peter KorsgaardQuoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1019385940FAIL:
test_run(tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/builds/buildroot.org/buildroot/support/testing/tests/core/test_timezone.py", line 66, intest_runself.assertEqual(tz[0].strip(), "EST")AssertionError: '' != 'EST'
Commit
7868289fd5348(package/zic: bump version to 2020f) bumped the zic version to 2020f, which changed the default output format from the classic "fat" format to the new "slim" format:
Quoted 6 lines
https://github.com/eggert/tz/commit/6ba6f2117b95eab345a7ed9159cef939e30c4cd3
The slim format is unfortunately not supported by glibc < 2.28 or uClibc, so explicitly request the classic "fat" format.
Signed-off-by Peter Korsgaard <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard