Re: [OE-core] [PATCH] tzdata: Allow controlling zoneinfo binary format
From: Zoltan Boszormenyi <hidden>
Date: 2021-07-06 15:18:27
2021. 07. 06. 17:12 keltezéssel, Zoltan Boszormenyi via lists.openembedded.org írta:
quoted hunk
From: Zoltán Böszörményi <redacted> tzcode 2020b changed the default format from "-b fat" to "-b slim". Allow external control for the binary format. Signed-off-by: Zoltán Böszörményi <redacted> --- meta/recipes-extended/timezone/tzdata.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index f8443110d5..09145e1ed0 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 \ " # pacificnew +# "slim" is the default since 2020b +# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql
FYI, the issue fixed by this change is: https://jira.mariadb.org/browse/MDEV-26093
+ZIC_FMT ?= "slim"
+
do_compile () {
for zone in ${TZONES}; do \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
+ ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
${S}/${zone} ; \
done
}