[oe-commits] org.oe.dev tzcode, tzdata: update to something that actually is fetchable, remove hardcoded paths, install binaries in correct staging dir and make sure we use the correct 'zic'
koen commit
openembedded-commits at lists.openembedded.org
Sun Mar 4 13:48:08 UTC 2007
tzcode, tzdata: update to something that actually is fetchable, remove hardcoded paths, install binaries in correct staging dir and make sure we use the correct 'zic'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 78f0eb3e73e29641b1fc18058e8a7a3229b3d8ce
ViewMTN: http://monotone.openembedded.org/revision.psp?id=78f0eb3e73e29641b1fc18058e8a7a3229b3d8ce
Files:
1
packages/tzcode/tzcode-native_2007a.bb
packages/tzcode/tzcode-native_2007c.bb
packages/tzdata/tzdata_2007a.bb
packages/tzdata/tzdata_2007c.bb
Diffs:
#
# mt diff -r01aabe2357b22904aad802251085c4e7a7c8df98 -r78f0eb3e73e29641b1fc18058e8a7a3229b3d8ce
#
#
#
# rename "packages/tzcode/tzcode-native_2007a.bb"
# to "packages/tzcode/tzcode-native_2007c.bb"
#
# rename "packages/tzdata/tzdata_2007a.bb"
# to "packages/tzdata/tzdata_2007c.bb"
#
# patch "packages/tzcode/tzcode-native_2007c.bb"
# from [99f9f96fc1e54f8b41c7e866de717c98c0c7f850]
# to [7247e5e386d190a6bebb3406d071ef6073394a5a]
#
# patch "packages/tzdata/tzdata_2007c.bb"
# from [6f6af2ec88f5ad4377a8cd2bd0d496edfc6fc9bb]
# to [b7d9235e043f38ac8d8eb1f29df59ffcc32275a7]
#
============================================================
--- packages/tzcode/tzcode-native_2007a.bb 99f9f96fc1e54f8b41c7e866de717c98c0c7f850
+++ packages/tzcode/tzcode-native_2007c.bb 7247e5e386d190a6bebb3406d071ef6073394a5a
@@ -1,6 +1,6 @@ DESCRIPTION = "tzcode, timezone zoneinfo
DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
@@ -10,9 +10,9 @@ do_stage () {
inherit native
do_stage () {
- install -m 755 zic ${STAGING_BINDIR}
- install -m 755 zdump ${STAGING_BINDIR}
- install -m 755 tzselect ${STAGING_BINDIR}
+ install -m 755 zic ${STAGING_BINDIR_NATIVE}
+ install -m 755 zdump ${STAGING_BINDIR_NATIVE}
+ install -m 755 tzselect ${STAGING_BINDIR_NATIVE}
}
do_install () {
============================================================
--- packages/tzdata/tzdata_2007a.bb 6f6af2ec88f5ad4377a8cd2bd0d496edfc6fc9bb
+++ packages/tzdata/tzdata_2007c.bb b7d9235e043f38ac8d8eb1f29df59ffcc32275a7
@@ -12,8 +12,6 @@ RCONFLICTS= "timezone-africa timezone-am
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
-PR = "r0"
-
SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
S = "${WORKDIR}"
@@ -25,17 +23,17 @@ do_compile () {
do_compile () {
for zone in ${TZONES}; do \
- zic -d ${WORKDIR}/usr/share/zoneinfo -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- zic -d ${WORKDIR}/usr/share/zoneinfo/posix -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- zic -d ${WORKDIR}/usr/share/zoneinfo/right -L ${S}/leapseconds \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
-y ${S}/yearistype.sh ${S}/${zone} ; \
done
}
do_install () {
- install -d ${D}/usr ${D}/usr/share ${D}/usr/share/zoneinfo
+ install -d ${D}/usr ${D}${datadir}/zoneinfo
cp -pPR ${S}/usr ${D}/
}
@@ -46,113 +44,113 @@ PACKAGES = "tzdata tzdata-misc tzdata-po
tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
-FILES_tzdata-africa += "/usr/share/zoneinfo/Africa/*"
+FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
RPROVIDES_tzdata-africa = "tzdata-africa"
-FILES_tzdata-americas += "/usr/share/zoneinfo/America/* \
- /usr/share/zoneinfo/US/* \
- /usr/share/zoneinfo/Brazil/* \
- /usr/share/zoneinfo/Canada/* \
- /usr/share/zoneinfo/Mexico/* \
- /usr/share/zoneinfo/Chile/*"
+FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \
+ ${datadir}/zoneinfo/US/* \
+ ${datadir}/zoneinfo/Brazil/* \
+ ${datadir}/zoneinfo/Canada/* \
+ ${datadir}/zoneinfo/Mexico/* \
+ ${datadir}/zoneinfo/Chile/*"
RPROVIDES_tzdata-americas = "tzdata-americas"
-FILES_tzdata-antarctica += "/usr/share/zoneinfo/Antarctica/*"
+FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*"
RPROVIDES_tzdata-antarctica = "tzdata-antarctica"
-FILES_tzdata-arctic += "/usr/share/zoneinfo/Arctic/*"
+FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*"
RPROVIDES_tzdata-arctic = "tzdata-arctic"
-FILES_tzdata-asia += "/usr/share/zoneinfo/Asia/* \
- /usr/share/zoneinfo/Indian/* \
- /usr/share/zoneinfo/Mideast/*"
+FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \
+ ${datadir}/zoneinfo/Indian/* \
+ ${datadir}/zoneinfo/Mideast/*"
RPROVIDES_tzdata-asia = "tzdata-asia"
-FILES_tzdata-atlantic += "/usr/share/zoneinfo/Atlantic/*"
+FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*"
RPROVIDES_tzdata-atlantic = "tzdata-atlantic"
-FILES_tzdata-australia += "/usr/share/zoneinfo/Australia/*"
+FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*"
RPROVIDES_tzdata-australia = "tzdata-australia"
-FILES_tzdata-europe += "/usr/share/zoneinfo/Europe/*"
+FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*"
RPROVIDES_tzdata-europe = "tzdata-europe"
-FILES_tzdata-pacific += "/usr/share/zoneinfo/Pacific/*"
+FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*"
RPROVIDES_tzdata-pacific = "tzdata-pacific"
-FILES_tzdata-posix += "/usr/share/zoneinfo/posix/*"
+FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*"
RPROVIDES_tzdata-posix = "tzdata-posix"
-FILES_tzdata-right += "/usr/share/zoneinfo/right/*"
+FILES_tzdata-right += "${datadir}/zoneinfo/right/*"
RPROVIDES_tzdata-right = "tzdata-right"
-FILES_tzdata-misc += "/usr/share/zoneinfo/Cuba \
- /usr/share/zoneinfo/Egypt \
- /usr/share/zoneinfo/Eire \
- /usr/share/zoneinfo/Factory \
- /usr/share/zoneinfo/GB-Eire \
- /usr/share/zoneinfo/Hongkong \
- /usr/share/zoneinfo/Iceland \
- /usr/share/zoneinfo/Iran \
- /usr/share/zoneinfo/Israel \
- /usr/share/zoneinfo/Jamaica \
- /usr/share/zoneinfo/Japan \
- /usr/share/zoneinfo/Kwajalein \
- /usr/share/zoneinfo/Libya \
- /usr/share/zoneinfo/Navajo \
- /usr/share/zoneinfo/Poland \
- /usr/share/zoneinfo/Portugal \
- /usr/share/zoneinfo/Singapore \
- /usr/share/zoneinfo/Turkey"
+FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
+ ${datadir}/zoneinfo/Egypt \
+ ${datadir}/zoneinfo/Eire \
+ ${datadir}/zoneinfo/Factory \
+ ${datadir}/zoneinfo/GB-Eire \
+ ${datadir}/zoneinfo/Hongkong \
+ ${datadir}/zoneinfo/Iceland \
+ ${datadir}/zoneinfo/Iran \
+ ${datadir}/zoneinfo/Israel \
+ ${datadir}/zoneinfo/Jamaica \
+ ${datadir}/zoneinfo/Japan \
+ ${datadir}/zoneinfo/Kwajalein \
+ ${datadir}/zoneinfo/Libya \
+ ${datadir}/zoneinfo/Navajo \
+ ${datadir}/zoneinfo/Poland \
+ ${datadir}/zoneinfo/Portugal \
+ ${datadir}/zoneinfo/Singapore \
+ ${datadir}/zoneinfo/Turkey"
RPROVIDES_tzdata-misc = "tzdata-misc"
+FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
+ ${datadir}/zoneinfo/America/Anchorage \
+ ${datadir}/zoneinfo/America/Los_Angeles \
+ ${datadir}/zoneinfo/America/Denver \
+ ${datadir}/zoneinfo/America/Chicago \
+ ${datadir}/zoneinfo/America/New_York \
+ ${datadir}/zoneinfo/America/Caracas \
+ ${datadir}/zoneinfo/America/Sao_Paulo \
+ ${datadir}/zoneinfo/Europe/London \
+ ${datadir}/zoneinfo/Europe/Paris \
+ ${datadir}/zoneinfo/Africa/Cairo \
+ ${datadir}/zoneinfo/Europe/Moscow \
+ ${datadir}/zoneinfo/Asia/Dubai \
+ ${datadir}/zoneinfo/Asia/Karachi \
+ ${datadir}/zoneinfo/Asia/Dhaka \
+ ${datadir}/zoneinfo/Asia/Bankok \
+ ${datadir}/zoneinfo/Asia/Hong_Kong \
+ ${datadir}/zoneinfo/Asia/Tokyo \
+ ${datadir}/zoneinfo/Australia/Sydney \
+ ${datadir}/zoneinfo/Pacific/Noumea \
+ ${datadir}/zoneinfo/CET \
+ ${datadir}/zoneinfo/CST6CDT \
+ ${datadir}/zoneinfo/EET \
+ ${datadir}/zoneinfo/EST \
+ ${datadir}/zoneinfo/EST5EDT \
+ ${datadir}/zoneinfo/GB \
+ ${datadir}/zoneinfo/GMT \
+ ${datadir}/zoneinfo/GMT+0 \
+ ${datadir}/zoneinfo/GMT-0 \
+ ${datadir}/zoneinfo/GMT0 \
+ ${datadir}/zoneinfo/Greenwich \
+ ${datadir}/zoneinfo/HST \
+ ${datadir}/zoneinfo/MET \
+ ${datadir}/zoneinfo/MST \
+ ${datadir}/zoneinfo/MST7MDT \
+ ${datadir}/zoneinfo/NZ \
+ ${datadir}/zoneinfo/NZ-CHAT \
+ ${datadir}/zoneinfo/PRC \
+ ${datadir}/zoneinfo/PST8PDT \
+ ${datadir}/zoneinfo/ROC \
+ ${datadir}/zoneinfo/ROK \
+ ${datadir}/zoneinfo/UCT \
+ ${datadir}/zoneinfo/UTC \
+ ${datadir}/zoneinfo/Universal \
+ ${datadir}/zoneinfo/W-SU \
+ ${datadir}/zoneinfo/WET \
+ ${datadir}/zoneinfo/Zulu \
+ ${datadir}/zoneinfo/Etc/*"
-FILES_${PN} += "/usr/share/zoneinfo/Pacific/Honolulu \
- /usr/share/zoneinfo/America/Anchorage \
- /usr/share/zoneinfo/America/Los_Angeles \
- /usr/share/zoneinfo/America/Denver \
- /usr/share/zoneinfo/America/Chicago \
- /usr/share/zoneinfo/America/New_York \
- /usr/share/zoneinfo/America/Caracas \
- /usr/share/zoneinfo/America/Sao_Paulo \
- /usr/share/zoneinfo/Europe/London \
- /usr/share/zoneinfo/Europe/Paris \
- /usr/share/zoneinfo/Africa/Cairo \
- /usr/share/zoneinfo/Europe/Moscow \
- /usr/share/zoneinfo/Asia/Dubai \
- /usr/share/zoneinfo/Asia/Karachi \
- /usr/share/zoneinfo/Asia/Dhaka \
- /usr/share/zoneinfo/Asia/Bankok \
- /usr/share/zoneinfo/Asia/Hong_Kong \
- /usr/share/zoneinfo/Asia/Tokyo \
- /usr/share/zoneinfo/Australia/Sydney \
- /usr/share/zoneinfo/Pacific/Noumea \
- /usr/share/zoneinfo/CET \
- /usr/share/zoneinfo/CST6CDT \
- /usr/share/zoneinfo/EET \
- /usr/share/zoneinfo/EST \
- /usr/share/zoneinfo/EST5EDT \
- /usr/share/zoneinfo/GB \
- /usr/share/zoneinfo/GMT \
- /usr/share/zoneinfo/GMT+0 \
- /usr/share/zoneinfo/GMT-0 \
- /usr/share/zoneinfo/GMT0 \
- /usr/share/zoneinfo/Greenwich \
- /usr/share/zoneinfo/HST \
- /usr/share/zoneinfo/MET \
- /usr/share/zoneinfo/MST \
- /usr/share/zoneinfo/MST7MDT \
- /usr/share/zoneinfo/NZ \
- /usr/share/zoneinfo/NZ-CHAT \
- /usr/share/zoneinfo/PRC \
- /usr/share/zoneinfo/PST8PDT \
- /usr/share/zoneinfo/ROC \
- /usr/share/zoneinfo/ROK \
- /usr/share/zoneinfo/UCT \
- /usr/share/zoneinfo/UTC \
- /usr/share/zoneinfo/Universal \
- /usr/share/zoneinfo/W-SU \
- /usr/share/zoneinfo/WET \
- /usr/share/zoneinfo/Zulu \
- /usr/share/zoneinfo/Etc/*"
More information about the Openembedded-commits
mailing list