diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-10-13 12:42:09 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-10-13 11:29:13 -0700 |
commit | e1f257af7ba4fb63deaabd86a9e571259a1135d0 (patch) | |
tree | aa69b10ef7f8a1968d2cce2f4854a3d48e174dd8 /meta | |
parent | b2c3ce6d17520d43b10777dd306449876cb40819 (diff) | |
download | poky-e1f257af7ba4fb63deaabd86a9e571259a1135d0.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/tzdata/tzdata_2010j.bb | 8 |
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" | |||
6 | LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" | 6 | LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" |
7 | DEPENDS = "tzcode-native" | 7 | DEPENDS = "tzcode-native" |
8 | 8 | ||
9 | PR = "r0" | 9 | PR = "r1" |
10 | 10 | ||
11 | RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ | 11 | RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ |
12 | timezone-arctic timezone-asia timezone-atlantic \ | 12 | timezone-arctic timezone-asia timezone-atlantic \ |
@@ -36,6 +36,10 @@ do_compile () { | |||
36 | do_install () { | 36 | do_install () { |
37 | install -d ${D}/usr ${D}${datadir}/zoneinfo | 37 | install -d ${D}/usr ${D}${datadir}/zoneinfo |
38 | cp -pPR ${S}/usr ${D}/ | 38 | cp -pPR ${S}/usr ${D}/ |
39 | # libc is removing zoneinfo files from package | ||
40 | cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo | ||
41 | cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo | ||
42 | |||
39 | } | 43 | } |
40 | 44 | ||
41 | # Packages primarily organized by directory with a major city | 45 | # Packages primarily organized by directory with a major city |
@@ -157,4 +161,6 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ | |||
157 | ${datadir}/zoneinfo/W-SU \ | 161 | ${datadir}/zoneinfo/W-SU \ |
158 | ${datadir}/zoneinfo/WET \ | 162 | ${datadir}/zoneinfo/WET \ |
159 | ${datadir}/zoneinfo/Zulu \ | 163 | ${datadir}/zoneinfo/Zulu \ |
164 | ${datadir}/zoneinfo/zone.tab \ | ||
165 | ${datadir}/zoneinfo/iso3166.tab \ | ||
160 | ${datadir}/zoneinfo/Etc/*" | 166 | ${datadir}/zoneinfo/Etc/*" |