summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/tzcode/tzcode-native_2011g.bb7
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2011h.bb (renamed from meta/recipes-extended/tzdata/tzdata_2011g.bb)8
2 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-extended/tzcode/tzcode-native_2011g.bb b/meta/recipes-extended/tzcode/tzcode-native_2011g.bb
index 95ba7ef3b..c4ed0ecdb 100644
--- a/meta/recipes-extended/tzcode/tzcode-native_2011g.bb
+++ b/meta/recipes-extended/tzcode/tzcode-native_2011g.bb
@@ -5,13 +5,12 @@ PR = "r0"
LIC_FILES_CHKSUM = "file://${WORKDIR}/README;md5=3ae8198f82258417ce29066d3b034035"
SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz;name=tzcode \
- ftp://elsie.nci.nih.gov/pub/tzdata2011g.tar.gz;name=tzdata"
+ ftp://elsie.nci.nih.gov/pub/tzdata2011h.tar.gz;name=tzdata"
SRC_URI[tzcode.md5sum] = "ecb564279b28c5b184421c525d997d6c"
SRC_URI[tzcode.sha256sum] = "636c735d8df1276cc8ab88bc31bb36a21f91ed34e26d181303ecd8fe48021bc2"
-SRC_URI[tzdata.md5sum] = "a068c27e7e426fdb12ab0c88506df20d"
-SRC_URI[tzdata.sha256sum] = "01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c"
-
+SRC_URI[tzdata.md5sum] = "546d27b6c1e5e1097bd512651815017f"
+SRC_URI[tzdata.sha256sum] = "c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24"
S = "${WORKDIR}"
diff --git a/meta/recipes-extended/tzdata/tzdata_2011g.bb b/meta/recipes-extended/tzdata/tzdata_2011h.bb
index 1437e4348..284cc5cd8 100644
--- a/meta/recipes-extended/tzdata/tzdata_2011g.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2011h.bb
@@ -5,17 +5,17 @@ LICENSE = "PD"
LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234"
DEPENDS = "tzcode-native"
-PR = "r1"
+PR = "r0"
RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
timezone-arctic timezone-asia timezone-atlantic \
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;name=tzdata"
-SRC_URI[md5sum] = "a068c27e7e426fdb12ab0c88506df20d"
-SRC_URI[sha256sum] = "01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c"
+SRC_URI[tzdata.md5sum] = "546d27b6c1e5e1097bd512651815017f"
+SRC_URI[tzdata.sha256sum] = "c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24"
S = "${WORKDIR}"