diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2012-02-03 22:38:55 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-05 16:04:51 +0100 |
| commit | d1c9f272fbb56ae80ca8b7e02c2bd2848d9ffa53 (patch) | |
| tree | 556a92d1d4ed6b6a8bee3a8f3375c28f731bbb0f | |
| parent | 07fd4e98b3fbd1fdd68ed4a872aef7c91e059de4 (diff) | |
| download | meta-openembedded-d1c9f272fbb56ae80ca8b7e02c2bd2848d9ffa53.tar.gz | |
tzdata_2011g: remove and use the updated recipe in oe-core.
* The tzdata_2011n recipe in oe-core now provides sane defaults,
* as committed with id 5304ce429f2c05857f04fbe3b47a067983ca96be
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-extended/tzdata/tzdata.inc | 177 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/tzdata/tzdata_2011g.bb | 12 |
2 files changed, 0 insertions, 189 deletions
diff --git a/meta-oe/recipes-extended/tzdata/tzdata.inc b/meta-oe/recipes-extended/tzdata/tzdata.inc deleted file mode 100644 index 94f73d83c7..0000000000 --- a/meta-oe/recipes-extended/tzdata/tzdata.inc +++ /dev/null | |||
| @@ -1,177 +0,0 @@ | |||
| 1 | DESCRIPTION = "Timezone data" | ||
| 2 | SECTION = "base" | ||
| 3 | DEPENDS = "tzcode-native" | ||
| 4 | |||
| 5 | INC_PR = "r11" | ||
| 6 | |||
| 7 | DEFAULT_TIMEZONE ?= "Europe/London" | ||
| 8 | |||
| 9 | RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \ | ||
| 10 | timezone-arctic timezone-asia timezone-atlantic \ | ||
| 11 | timezone-australia timezone-europe timezone-indian \ | ||
| 12 | timezone-iso3166.tab timezone-pacific timezone-zone.tab" | ||
| 13 | |||
| 14 | SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;subdir=${BPN}-${PV}" | ||
| 15 | |||
| 16 | TZONES= "africa antarctica asia australasia europe northamerica southamerica \ | ||
| 17 | factory solar87 solar88 solar89 etcetera backward systemv \ | ||
| 18 | " | ||
| 19 | # pacificnew \ | ||
| 20 | |||
| 21 | CONFFILES_${PN} = "${sysconfdir}/timezone ${sysconfdir}/localtime" | ||
| 22 | |||
| 23 | do_compile () { | ||
| 24 | mkdir -p build | ||
| 25 | for zone in ${TZONES}; do \ | ||
| 26 | ${STAGING_BINDIR_NATIVE}/zic -d ${S}/build${datadir}/zoneinfo -L /dev/null \ | ||
| 27 | -y ${S}/yearistype.sh ${S}/${zone} ; \ | ||
| 28 | ${STAGING_BINDIR_NATIVE}/zic -d ${S}/build${datadir}/zoneinfo/posix -L /dev/null \ | ||
| 29 | -y ${S}/yearistype.sh ${S}/${zone} ; \ | ||
| 30 | ${STAGING_BINDIR_NATIVE}/zic -d ${S}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \ | ||
| 31 | -y ${S}/yearistype.sh ${S}/${zone} ; \ | ||
| 32 | done | ||
| 33 | } | ||
| 34 | |||
| 35 | do_install () { | ||
| 36 | install -d ${D}${prefix} ${D}${datadir}/zoneinfo | ||
| 37 | cp -pPR ${S}/build${prefix}/* ${D}${prefix} | ||
| 38 | # Only eglibc is removing zoneinfo files from package | ||
| 39 | if [ "${LIBC}"x = "eglibc"x ] ; then | ||
| 40 | cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo | ||
| 41 | cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo | ||
| 42 | fi | ||
| 43 | |||
| 44 | # Install a sane default for timezones | ||
| 45 | install -d ${D}${sysconfdir} | ||
| 46 | echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone | ||
| 47 | cp -pPR ${S}/build${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime | ||
| 48 | } | ||
| 49 | |||
| 50 | inherit allarch | ||
| 51 | # Packages primarily organized by directory with a major city | ||
| 52 | # in most time zones in the base package | ||
| 53 | |||
| 54 | PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ | ||
| 55 | tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ | ||
| 56 | tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" | ||
| 57 | |||
| 58 | ALLOW_EMPTY_${PN}-dbg = "1" | ||
| 59 | |||
| 60 | FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" | ||
| 61 | RPROVIDES_tzdata-africa = "tzdata-africa" | ||
| 62 | |||
| 63 | FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ | ||
| 64 | ${datadir}/zoneinfo/US/* \ | ||
| 65 | ${datadir}/zoneinfo/Brazil/* \ | ||
| 66 | ${datadir}/zoneinfo/Canada/* \ | ||
| 67 | ${datadir}/zoneinfo/Mexico/* \ | ||
| 68 | ${datadir}/zoneinfo/Chile/*" | ||
| 69 | RPROVIDES_tzdata-americas = "tzdata-americas" | ||
| 70 | |||
| 71 | FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" | ||
| 72 | RPROVIDES_tzdata-antarctica = "tzdata-antarctica" | ||
| 73 | |||
| 74 | FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" | ||
| 75 | RPROVIDES_tzdata-arctic = "tzdata-arctic" | ||
| 76 | |||
| 77 | FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ | ||
| 78 | ${datadir}/zoneinfo/Indian/* \ | ||
| 79 | ${datadir}/zoneinfo/Mideast/*" | ||
| 80 | RPROVIDES_tzdata-asia = "tzdata-asia" | ||
| 81 | |||
| 82 | FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" | ||
| 83 | RPROVIDES_tzdata-atlantic = "tzdata-atlantic" | ||
| 84 | |||
| 85 | FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" | ||
| 86 | RPROVIDES_tzdata-australia = "tzdata-australia" | ||
| 87 | |||
| 88 | FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" | ||
| 89 | RPROVIDES_tzdata-europe = "tzdata-europe" | ||
| 90 | |||
| 91 | FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" | ||
| 92 | RPROVIDES_tzdata-pacific = "tzdata-pacific" | ||
| 93 | |||
| 94 | FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" | ||
| 95 | RPROVIDES_tzdata-posix = "tzdata-posix" | ||
| 96 | |||
| 97 | FILES_tzdata-right += "${datadir}/zoneinfo/right/*" | ||
| 98 | RPROVIDES_tzdata-right = "tzdata-right" | ||
| 99 | |||
| 100 | |||
| 101 | FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ | ||
| 102 | ${datadir}/zoneinfo/Egypt \ | ||
| 103 | ${datadir}/zoneinfo/Eire \ | ||
| 104 | ${datadir}/zoneinfo/Factory \ | ||
| 105 | ${datadir}/zoneinfo/GB-Eire \ | ||
| 106 | ${datadir}/zoneinfo/Hongkong \ | ||
| 107 | ${datadir}/zoneinfo/Iceland \ | ||
| 108 | ${datadir}/zoneinfo/Iran \ | ||
| 109 | ${datadir}/zoneinfo/Israel \ | ||
| 110 | ${datadir}/zoneinfo/Jamaica \ | ||
| 111 | ${datadir}/zoneinfo/Japan \ | ||
| 112 | ${datadir}/zoneinfo/Kwajalein \ | ||
| 113 | ${datadir}/zoneinfo/Libya \ | ||
| 114 | ${datadir}/zoneinfo/Navajo \ | ||
| 115 | ${datadir}/zoneinfo/Poland \ | ||
| 116 | ${datadir}/zoneinfo/Portugal \ | ||
| 117 | ${datadir}/zoneinfo/Singapore \ | ||
| 118 | ${datadir}/zoneinfo/Turkey" | ||
| 119 | RPROVIDES_tzdata-misc = "tzdata-misc" | ||
| 120 | |||
| 121 | |||
| 122 | FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ | ||
| 123 | ${datadir}/zoneinfo/America/Anchorage \ | ||
| 124 | ${datadir}/zoneinfo/America/Los_Angeles \ | ||
| 125 | ${datadir}/zoneinfo/America/Denver \ | ||
| 126 | ${datadir}/zoneinfo/America/Chicago \ | ||
| 127 | ${datadir}/zoneinfo/America/New_York \ | ||
| 128 | ${datadir}/zoneinfo/America/Caracas \ | ||
| 129 | ${datadir}/zoneinfo/America/Sao_Paulo \ | ||
| 130 | ${datadir}/zoneinfo/Europe/London \ | ||
| 131 | ${datadir}/zoneinfo/Europe/Paris \ | ||
| 132 | ${datadir}/zoneinfo/Africa/Cairo \ | ||
| 133 | ${datadir}/zoneinfo/Europe/Moscow \ | ||
| 134 | ${datadir}/zoneinfo/Asia/Dubai \ | ||
| 135 | ${datadir}/zoneinfo/Asia/Karachi \ | ||
| 136 | ${datadir}/zoneinfo/Asia/Dhaka \ | ||
| 137 | ${datadir}/zoneinfo/Asia/Bankok \ | ||
| 138 | ${datadir}/zoneinfo/Asia/Hong_Kong \ | ||
| 139 | ${datadir}/zoneinfo/Asia/Tokyo \ | ||
| 140 | ${datadir}/zoneinfo/Australia/Perth \ | ||
| 141 | ${datadir}/zoneinfo/Australia/Darwin \ | ||
| 142 | ${datadir}/zoneinfo/Australia/Adelaide \ | ||
| 143 | ${datadir}/zoneinfo/Australia/Brisbane \ | ||
| 144 | ${datadir}/zoneinfo/Australia/Sydney \ | ||
| 145 | ${datadir}/zoneinfo/Pacific/Noumea \ | ||
| 146 | ${datadir}/zoneinfo/CET \ | ||
| 147 | ${datadir}/zoneinfo/CST6CDT \ | ||
| 148 | ${datadir}/zoneinfo/EET \ | ||
| 149 | ${datadir}/zoneinfo/EST \ | ||
| 150 | ${datadir}/zoneinfo/EST5EDT \ | ||
| 151 | ${datadir}/zoneinfo/GB \ | ||
| 152 | ${datadir}/zoneinfo/GMT \ | ||
| 153 | ${datadir}/zoneinfo/GMT+0 \ | ||
| 154 | ${datadir}/zoneinfo/GMT-0 \ | ||
| 155 | ${datadir}/zoneinfo/GMT0 \ | ||
| 156 | ${datadir}/zoneinfo/Greenwich \ | ||
| 157 | ${datadir}/zoneinfo/HST \ | ||
| 158 | ${datadir}/zoneinfo/MET \ | ||
| 159 | ${datadir}/zoneinfo/MST \ | ||
| 160 | ${datadir}/zoneinfo/MST7MDT \ | ||
| 161 | ${datadir}/zoneinfo/NZ \ | ||
| 162 | ${datadir}/zoneinfo/NZ-CHAT \ | ||
| 163 | ${datadir}/zoneinfo/PRC \ | ||
| 164 | ${datadir}/zoneinfo/PST8PDT \ | ||
| 165 | ${datadir}/zoneinfo/ROC \ | ||
| 166 | ${datadir}/zoneinfo/ROK \ | ||
| 167 | ${datadir}/zoneinfo/UCT \ | ||
| 168 | ${datadir}/zoneinfo/UTC \ | ||
| 169 | ${datadir}/zoneinfo/Universal \ | ||
| 170 | ${datadir}/zoneinfo/W-SU \ | ||
| 171 | ${datadir}/zoneinfo/WET \ | ||
| 172 | ${datadir}/zoneinfo/Zulu \ | ||
| 173 | ${datadir}/zoneinfo/Etc/* \ | ||
| 174 | ${datadir}/zoneinfo/iso3166.tab \ | ||
| 175 | ${datadir}/zoneinfo/zone.tab \ | ||
| 176 | ${sysconfdir}/localtime \ | ||
| 177 | ${sysconfdir}/timezone " | ||
diff --git a/meta-oe/recipes-extended/tzdata/tzdata_2011g.bb b/meta-oe/recipes-extended/tzdata/tzdata_2011g.bb deleted file mode 100644 index 6863b5a714..0000000000 --- a/meta-oe/recipes-extended/tzdata/tzdata_2011g.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require tzdata.inc | ||
| 2 | |||
| 3 | LICENSE = "PD" | ||
| 4 | LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" | ||
| 5 | |||
| 6 | # Note that elsie.nci.nih.gov removes old archives after a new one is | ||
| 7 | # released. So if this doesn't build for you because of missing source file | ||
| 8 | # just bump it to the latest available version, removing the old one | ||
| 9 | |||
| 10 | PR = "${INC_PR}.0" | ||
| 11 | SRC_URI[md5sum] = "a068c27e7e426fdb12ab0c88506df20d" | ||
| 12 | SRC_URI[sha256sum] = "01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c" | ||
