From 6353ee67edad85112b3a28679eb06cb6a281b005 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 13 Jun 2015 22:03:42 -0700 Subject: [PATCH] tzdata: update to 2015e merged inc back into recipe. Changes affecting future time stamps Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.) Assume Cayman Islands will observe DST starting next year, using US rules. Although it isn't guaranteed, it is the most likely. (From OE-Core rev: 3c63274c306c46d2ec9210b1b505b2a0aafccb70) Signed-off-by: Armin Kuster Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/tzdata/tzdata_2015d.bb | 6 ------ .../recipes-extended/tzdata/{tzdata.inc => tzdata_2015e.bb} | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2015d.bb rename meta/recipes-extended/tzdata/{tzdata.inc => tzdata_2015e.bb} (97%) diff --git a/meta/recipes-extended/tzdata/tzdata_2015d.bb b/meta/recipes-extended/tzdata/tzdata_2015d.bb deleted file mode 100644 index d8e5f24986..0000000000 --- a/meta/recipes-extended/tzdata/tzdata_2015d.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" - -SRC_URI[tzdata.md5sum] = "b595bdc4474b8fc1a15cffc67c66025b" -SRC_URI[tzdata.sha256sum] = "8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531" - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata.inc b/meta/recipes-extended/tzdata/tzdata_2015e.bb similarity index 97% rename from meta/recipes-extended/tzdata/tzdata.inc rename to meta/recipes-extended/tzdata/tzdata_2015e.bb index ee56d36395..9179d7be4f 100644 --- a/meta/recipes-extended/tzdata/tzdata.inc +++ b/meta/recipes-extended/tzdata/tzdata_2015e.bb @@ -5,6 +5,11 @@ LICENSE = "PD & BSD" LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=996a9811747aa48db91ed239e5b355a1" DEPENDS = "tzcode-native" +SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" + +SRC_URI[tzdata.md5sum] = "36f9056efb432ca945c73397acfce0d4" +SRC_URI[tzdata.sha256sum] = "ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f" + inherit allarch RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \