diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-03-13 12:06:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-28 22:31:54 +0100 |
commit | 768281bd9157508c118bc92d633d33477430f506 (patch) | |
tree | 0cf4ab2ef89c2ad0805cfa33af7658e36ffcf5ae /meta/recipes-extended | |
parent | d8c397a3f250558a37f04176218b4ca26310ea0f (diff) | |
download | poky-768281bd9157508c118bc92d633d33477430f506.tar.gz |
tzdata: use separate B instead of WORKDIR for zic output
* avoid copying whole exec_prefix over base_prefix as there
were only zoneinfo files anyway
(From OE-Core rev: cf96296296a71d0d164f4e528991f0946efe9b29)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 37846f8735683ed0fab5ef5c12d77c6041348801)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/timezone/tzdata.bb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index ce725008c0..dd1960ffa7 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb | |||
@@ -16,17 +16,21 @@ TZONES = " \ | |||
16 | # "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql | 16 | # "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql |
17 | ZIC_FMT ?= "slim" | 17 | ZIC_FMT ?= "slim" |
18 | 18 | ||
19 | do_configure[cleandirs] = "${B}" | ||
20 | B = "${WORKDIR}/build" | ||
21 | |||
19 | do_compile() { | 22 | do_compile() { |
20 | for zone in ${TZONES}; do | 23 | for zone in ${TZONES}; do |
21 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null ${S}/${zone} | 24 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} |
22 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null ${S}/${zone} | 25 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} |
23 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone} | 26 | ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone} |
24 | done | 27 | done |
25 | } | 28 | } |
26 | 29 | ||
27 | do_install() { | 30 | do_install() { |
28 | install -d ${D}$exec_prefix ${D}${datadir}/zoneinfo | 31 | install -d ${D}${datadir}/zoneinfo |
29 | cp -pPR ${WORKDIR}$exec_prefix ${D}${base_prefix} | 32 | cp -pPR ${B}/zoneinfo/* ${D}${datadir}/zoneinfo |
33 | |||
30 | # libc is removing zoneinfo files from package | 34 | # libc is removing zoneinfo files from package |
31 | cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo | 35 | cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo |
32 | cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo | 36 | cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo |