From 79ec8e2711442eb7882ad7db7d3ab97f96484daa Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 18 Mar 2013 13:46:51 -0700 Subject: [PATCH] tzcode & tzdata: update to 2013b versions Rename and modifying existing recipes to use 2013b versions of time zone. (From OE-Core rev: ba748709ff01f9a0ea9b1671d509c971a271ed2f) Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- ...zcode-native_2012j.bb => tzcode-native_2013b.bb} | 13 +++++++------ .../tzdata/{tzdata_2012j.bb => tzdata_2013b.bb} | 6 ++---- 2 files changed, 9 insertions(+), 10 deletions(-) rename meta/recipes-extended/tzcode/{tzcode-native_2012j.bb => tzcode-native_2013b.bb} (51%) rename meta/recipes-extended/tzdata/{tzdata_2012j.bb => tzdata_2013b.bb} (98%) diff --git a/meta/recipes-extended/tzcode/tzcode-native_2012j.bb b/meta/recipes-extended/tzcode/tzcode-native_2013b.bb similarity index 51% rename from meta/recipes-extended/tzcode/tzcode-native_2012j.bb rename to meta/recipes-extended/tzcode/tzcode-native_2013b.bb index 938f072999..114aa9c932 100644 --- a/meta/recipes-extended/tzcode/tzcode-native_2012j.bb +++ b/meta/recipes-extended/tzcode/tzcode-native_2013b.bb @@ -1,16 +1,17 @@ DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" LICENSE = "PD" -PR = "r1" LIC_FILES_CHKSUM = "file://${WORKDIR}/README;md5=d7a19b8c6d8a28785c4cd04ff2e46d27" +# note that we allow for us to use data later than our code version +# SRC_URI =" ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz;name=tzdata" + ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz;name=tzdata" -SRC_URI[tzcode.md5sum] = "868b5d0dbf0e115ae4eb39a932ad0c4c" -SRC_URI[tzcode.sha256sum] = "ee4361b3b4ae201a270857c84d0f063c2a2191b3e4cd7414ea4622bb8bae9a82" -SRC_URI[tzdata.md5sum] = "ba2f92ae7ad099090e8f86cff2f2d799" -SRC_URI[tzdata.sha256sum] = "4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa" +SRC_URI[tzcode.md5sum] = "c8bb91ce60092ef61d628d104ad3dab1" +SRC_URI[tzcode.sha256sum] = "fda9a8bd15f06939f0ecd1edba17d5e66d4d526632145609574459b250ab0efb" +SRC_URI[tzdata.md5sum] = "489dbca77d1f2e287a3987ca047bb246" +SRC_URI[tzdata.sha256sum] = "70d589d0e76a3749403d2bb404e9214c2520dda4c13e4b07b1b945ed2c64edb2" S = "${WORKDIR}" diff --git a/meta/recipes-extended/tzdata/tzdata_2012j.bb b/meta/recipes-extended/tzdata/tzdata_2013b.bb similarity index 98% rename from meta/recipes-extended/tzdata/tzdata_2012j.bb rename to meta/recipes-extended/tzdata/tzdata_2013b.bb index 25220cc36e..0b34e851d6 100644 --- a/meta/recipes-extended/tzdata/tzdata_2012j.bb +++ b/meta/recipes-extended/tzdata/tzdata_2013b.bb @@ -5,8 +5,6 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" DEPENDS = "tzcode-native" -PR = "r3" - inherit allarch RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \ @@ -16,8 +14,8 @@ RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarcti SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" -SRC_URI[tzdata.md5sum] = "ba2f92ae7ad099090e8f86cff2f2d799" -SRC_URI[tzdata.sha256sum] = "4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa" +SRC_URI[tzdata.md5sum] = "489dbca77d1f2e287a3987ca047bb246" +SRC_URI[tzdata.sha256sum] = "70d589d0e76a3749403d2bb404e9214c2520dda4c13e4b07b1b945ed2c64edb2" S = "${WORKDIR}"