diff options
| author | Simone Weiß <simone.p.weiss@posteo.com> | 2024-05-30 16:44:48 +0000 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-07-26 07:43:46 -0700 |
| commit | 855256ad3f30b7e2ccbd4798bf7e5d5d8fc8b2ce (patch) | |
| tree | ab14e3e09be1ffb6568645a84ec817e678e855d4 | |
| parent | 398e77fc215d7526fa7dbfe913587f3479c6b17c (diff) | |
| download | poky-855256ad3f30b7e2ccbd4798bf7e5d5d8fc8b2ce.tar.gz | |
tzdata: Add tzdata.zi to tzdata-core package
Additionally build and package tzdata.zi info file, as e.g. Systemd expects it
to be present.
[YOCTO #15172]
(From OE-Core rev: cea6bc554f8326d1d7b680ce8e8a05f1f186b6d0)
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>
| -rw-r--r-- | meta/recipes-extended/timezone/tzdata.bb | 3 |
1 files changed, 3 insertions, 0 deletions
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}" | |||
| 20 | B = "${WORKDIR}/build" | 20 | B = "${WORKDIR}/build" |
| 21 | 21 | ||
| 22 | do_compile() { | 22 | do_compile() { |
| 23 | oe_runmake -C ${S} tzdata.zi | ||
| 23 | for zone in ${TZONES}; do | 24 | for zone in ${TZONES}; do |
| 24 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} | 25 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} |
| 25 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} | 26 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} |
| @@ -37,6 +38,7 @@ do_install() { | |||
| 37 | cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo | 38 | cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo |
| 38 | cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo | 39 | cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo |
| 39 | cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo | 40 | cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo |
| 41 | cp -pP "${S}/tzdata.zi" ${D}${datadir}/zoneinfo | ||
| 40 | 42 | ||
| 41 | # Install default timezone | 43 | # Install default timezone |
| 42 | if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then | 44 | if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then |
| @@ -141,6 +143,7 @@ FILES:tzdata-core += " \ | |||
| 141 | ${sysconfdir}/timezone \ | 143 | ${sysconfdir}/timezone \ |
| 142 | ${datadir}/zoneinfo/leapseconds \ | 144 | ${datadir}/zoneinfo/leapseconds \ |
| 143 | ${datadir}/zoneinfo/leap-seconds.list \ | 145 | ${datadir}/zoneinfo/leap-seconds.list \ |
| 146 | ${datadir}/zoneinfo/tzdata.zi \ | ||
| 144 | ${datadir}/zoneinfo/Pacific/Honolulu \ | 147 | ${datadir}/zoneinfo/Pacific/Honolulu \ |
| 145 | ${datadir}/zoneinfo/America/Anchorage \ | 148 | ${datadir}/zoneinfo/America/Anchorage \ |
| 146 | ${datadir}/zoneinfo/America/Los_Angeles \ | 149 | ${datadir}/zoneinfo/America/Los_Angeles \ |
