]> code.ossystems Code Review - openembedded-core.git/commitdiff
tzdata: install zone.tab and iso1366.tab
authorZhai Edwin <edwin.zhai@intel.com>
Wed, 13 Oct 2010 04:42:09 +0000 (12:42 +0800)
committerSaul Wold <Saul.Wold@intel.com>
Wed, 13 Oct 2010 18:29:13 +0000 (11:29 -0700)
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>
meta/recipes-extended/tzdata/tzdata_2010j.bb

index 97eb1173c16349eddecc0e37ce09024ff8efae39..29d4cfd0528b991dbd96ad953c84f0a184a0837d 100644 (file)
@@ -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/*"