diff mbox series

[scarthgap,12/17] tzdata: Add tzdata.zi to tzdata-core package

Message ID cea6bc554f8326d1d7b680ce8e8a05f1f186b6d0.1721740245.git.steve@sakoman.com
State Accepted
Delegated to: Steve Sakoman
Headers show
Series [scarthgap,01/17] glibc: stable 2.39 branch updates | expand

Commit Message

Steve Sakoman July 23, 2024, 1:13 p.m. UTC 
From: Simone Weiß <simone.p.weiss@posteo.com>

Additionally build and package tzdata.zi info file, as e.g. Systemd expects it
to be present.

[YOCTO #15172]

Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a57c7062c9b70361486898974beba4682cf4a76d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-extended/timezone/tzdata.bb | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index dd1960ffa7..2099b05db8 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -20,6 +20,7 @@  do_configure[cleandirs] = "${B}"
 B = "${WORKDIR}/build"
 
 do_compile() {
+	oe_runmake -C ${S} tzdata.zi
 	for zone in ${TZONES}; do
 		${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone}
 		${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone}
@@ -37,6 +38,7 @@  do_install() {
 	cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
 	cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
 	cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
+	cp -pP "${S}/tzdata.zi" ${D}${datadir}/zoneinfo
 
 	# Install default timezone
 	if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
@@ -141,6 +143,7 @@  FILES:tzdata-core += " \
     ${sysconfdir}/timezone \
     ${datadir}/zoneinfo/leapseconds \
     ${datadir}/zoneinfo/leap-seconds.list \
+    ${datadir}/zoneinfo/tzdata.zi \
     ${datadir}/zoneinfo/Pacific/Honolulu \
     ${datadir}/zoneinfo/America/Anchorage \
     ${datadir}/zoneinfo/America/Los_Angeles \