Skip to contentSkip to conversation

tzdata: Allow controlling zoneinfo binary format

PATCH Zoltan Boszormenyi 1 participant 1 message Jul 6, 2021 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

2021. 07. 06. 17:12 keltezéssel, Zoltan Boszormenyi via lists.openembedded.org írta:

Quoted 15 lines

From: Zoltán Böszörményi <[email protected]>

tzcode 2020b changed the default format from "-b fat" to "-b slim". Allow external control for the binary format.

---
  meta/recipes-extended/timezone/tzdata.bb | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
meta/recipes-extended/timezone/tzdata.bb +0 -0
index f8443110d5..09145e1ed0 100644

meta/recipes-extended/timezone/tzdata.bb TZONES= "africa antarctica asia australasia europe northamerica southamerica \ · line 23

Quoted 5 lines
meta/recipes-extended/timezone/tzdata.bb +2 -0
@@ -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

Quoted 20 lines
meta/recipes-extended/timezone/tzdata.bb +5 -3
+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
  }