From e1f257af7ba4fb63deaabd86a9e571259a1135d0 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 13 Oct 2010 12:42:09 +0800 Subject: tzdata: install zone.tab and iso1366.tab These files are removed in libc-package.bbclass. Missing of zone.tab cause get_zone_directory in libical return NULL for strlen, which leads seg fault of dates & tasks. Openembedded has similar patch. [BUGID #420] got fixed by this. Signed-off-by: Zhai Edwin --- meta/recipes-extended/tzdata/tzdata_2010j.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended/tzdata') diff --git a/meta/recipes-extended/tzdata/tzdata_2010j.bb b/meta/recipes-extended/tzdata/tzdata_2010j.bb index 97eb1173c1..29d4cfd052 100644 --- a/meta/recipes-extended/tzdata/tzdata_2010j.bb +++ b/meta/recipes-extended/tzdata/tzdata_2010j.bb @@ -6,7 +6,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" DEPENDS = "tzcode-native" -PR = "r0" +PR = "r1" RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ @@ -36,6 +36,10 @@ do_compile () { do_install () { install -d ${D}/usr ${D}${datadir}/zoneinfo cp -pPR ${S}/usr ${D}/ + # libc is removing zoneinfo files from package + cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo + } # Packages primarily organized by directory with a major city @@ -157,4 +161,6 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/W-SU \ ${datadir}/zoneinfo/WET \ ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/zone.tab \ + ${datadir}/zoneinfo/iso3166.tab \ ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3-54-g00ecf