diff options
author | Zoltán Böszörményi <zboszor@gmail.com> | 2021-07-06 17:12:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-15 15:27:49 +0100 |
commit | cada971ded80babceba7ab12d565918bb130a50c (patch) | |
tree | 5678e6a1b832433485de33d6360cce27ed1f8554 | |
parent | 9c5de5292f65ef1ae788c4da1b272a5da8055d77 (diff) | |
download | poky-cada971ded80babceba7ab12d565918bb130a50c.tar.gz |
tzdata: Allow controlling zoneinfo binary format
tzcode 2020b changed the default format from "-b fat" to "-b slim".
Allow external control for the binary format.
(From OE-Core rev: 1e9393cae53b4de260ec951e7855d74f206730d0)
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c9e8b716eb71d4526517825eacefb91ab2c1781c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/timezone/tzdata.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index e6a0655afe..cc6206ac70 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb | |||
@@ -19,13 +19,17 @@ TZONES= "africa antarctica asia australasia europe northamerica southamerica \ | |||
19 | " | 19 | " |
20 | # pacificnew | 20 | # pacificnew |
21 | 21 | ||
22 | # "slim" is the default since 2020b | ||
23 | # "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql | ||
24 | ZIC_FMT ?= "slim" | ||
25 | |||
22 | do_compile () { | 26 | do_compile () { |
23 | for zone in ${TZONES}; do \ | 27 | for zone in ${TZONES}; do \ |
24 | ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ | 28 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ |
25 | ${S}/${zone} ; \ | 29 | ${S}/${zone} ; \ |
26 | ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ | 30 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ |
27 | ${S}/${zone} ; \ | 31 | ${S}/${zone} ; \ |
28 | ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ | 32 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ |
29 | ${S}/${zone} ; \ | 33 | ${S}/${zone} ; \ |
30 | done | 34 | done |
31 | } | 35 | } |