summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-10-13 12:42:09 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-10-13 11:29:13 -0700
commite1f257af7ba4fb63deaabd86a9e571259a1135d0 (patch)
treeaa69b10ef7f8a1968d2cce2f4854a3d48e174dd8
parentb2c3ce6d17520d43b10777dd306449876cb40819 (diff)
downloadopenembedded-core-e1f257af7ba4fb63deaabd86a9e571259a1135d0.tar.gz
openembedded-core-e1f257af7ba4fb63deaabd86a9e571259a1135d0.tar.bz2
openembedded-core-e1f257af7ba4fb63deaabd86a9e571259a1135d0.zip
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 <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2010j.bb8
1 files changed, 7 insertions, 1 deletions
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/*"