aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/tzdata
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-11-20 10:48:39 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-11-20 10:48:39 +0100
commite8ade1114b78b7a6f2deba1088055abd0ac05e05 (patch)
tree818472038b94a4da1b1d0625e85c53e14a667fb8 /recipes/tzdata
parentfe7f68d534deacbda857c4f96a9c4c906ef7315e (diff)
downloadopenembedded-e8ade1114b78b7a6f2deba1088055abd0ac05e05.tar.gz
openembedded-e8ade1114b78b7a6f2deba1088055abd0ac05e05.tar.bz2
openembedded-e8ade1114b78b7a6f2deba1088055abd0ac05e05.zip
tzdata: add 2009s, fix typo in do_compile, install zone.tab and iso1366.tab for eglibc
* there was ${WORKDIR}} * zone.tab, iso1366.tab is removed in eglibc/eglibc-package.bbclass
Diffstat (limited to 'recipes/tzdata')
-rw-r--r--recipes/tzdata/tzdata.inc13
-rw-r--r--recipes/tzdata/tzdata_2009s.bb3
2 files changed, 13 insertions, 3 deletions
diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 71de930761..cfc5d2f8e8 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
DEPENDS = "tzcode-native"
-INC_PR = "r4"
+INC_PR = "r5"
DEFAULT_TIMEZONE ?= "Europe/London"
@@ -28,9 +28,9 @@ do_compile () {
for zone in ${TZONES}; do \
${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/posix -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo/posix -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \
-y ${S}/yearistype.sh ${S}/${zone} ; \
done
}
@@ -38,6 +38,11 @@ do_compile () {
do_install () {
install -d ${D}${prefix} ${D}${datadir}/zoneinfo
cp -pPR ${WORKDIR}/build${prefix}/* ${D}${prefix}
+ # Only eglibc is removing zoneinfo files from package
+ if [ "${LIBC}"x == "eglibc"x ] ; then
+ cp -pP "${WORKDIR}/zone.tab" ${D}${datadir}/zoneinfo
+ cp -pP "${WORKDIR}/iso3166.tab" ${D}${datadir}/zoneinfo
+ fi
# Install a sane default for timezones
install -d ${D}${sysconfdir}
@@ -168,5 +173,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
${datadir}/zoneinfo/WET \
${datadir}/zoneinfo/Zulu \
${datadir}/zoneinfo/Etc/* \
+ ${datadir}/zoneinfo/iso3166.tab \
+ ${datadir}/zoneinfo/zone.tab \
${sysconfdir}/localtime \
${sysconfdir}/timezone "
diff --git a/recipes/tzdata/tzdata_2009s.bb b/recipes/tzdata/tzdata_2009s.bb
new file mode 100644
index 0000000000..17c2dd4f0c
--- /dev/null
+++ b/recipes/tzdata/tzdata_2009s.bb
@@ -0,0 +1,3 @@
+require tzdata.inc
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
+PR = "${INC_PR}.0"