summaryrefslogtreecommitdiff
path: root/recipes/tzdata
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/tzdata')
-rw-r--r--recipes/tzdata/tzdata.inc4
-rw-r--r--recipes/tzdata/tzdata/russia-2010.diff32
-rw-r--r--recipes/tzdata/tzdata_2007k.bb3
-rw-r--r--recipes/tzdata/tzdata_2009m.bb3
-rw-r--r--recipes/tzdata/tzdata_2009o.bb3
-rw-r--r--recipes/tzdata/tzdata_2009p.bb3
-rw-r--r--recipes/tzdata/tzdata_2009s.bb4
-rw-r--r--recipes/tzdata/tzdata_2010b.bb5
-rw-r--r--recipes/tzdata/tzdata_2010h.bb7
9 files changed, 7 insertions, 57 deletions
diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 6d8062eb3c..1f4dfdb7aa 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
DEPENDS = "tzcode-native"
-INC_PR = "r6"
+INC_PR = "r7"
DEFAULT_TIMEZONE ?= "Europe/London"
@@ -12,7 +12,7 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
-SRC_URI = "http://bent.latency.net/bent/darcs/zoneinfo-${PV}/src/tzdata${PV}.tar.gz"
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;name=tar"
S = "${WORKDIR}"
diff --git a/recipes/tzdata/tzdata/russia-2010.diff b/recipes/tzdata/tzdata/russia-2010.diff
deleted file mode 100644
index 4616badcd7..0000000000
--- a/recipes/tzdata/tzdata/russia-2010.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/europe
-+++ b/europe
-@@ -2041,7 +2041,8 @@
- 3:00 Russia KUY%sT 1991 Mar 31 2:00s
- 2:00 Russia KUY%sT 1991 Sep 29 2:00s
- 3:00 - KUYT 1991 Oct 20 3:00
-- 4:00 Russia SAM%sT # Samara Time
-+ 4:00 Russia SAM%sT 2010 Mar 28 2:00s
-+ 3:00 Russia SAM%sT # Samara Time
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
- # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
-@@ -2194,7 +2195,8 @@
- 11:00 - PETT 1930 Jun 21 # P-K Time
- 12:00 Russia PET%sT 1991 Mar 31 2:00s
- 11:00 Russia PET%sT 1992 Jan 19 2:00s
-- 12:00 Russia PET%sT
-+ 12:00 Russia PET%sT 2010 Mar 28 2:00s
-+ 11:00 Russia PET%sT
- #
- # Chukotskij avtonomnyj okrug
- Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2
-@@ -2202,7 +2204,8 @@
- 13:00 Russia ANA%sT 1982 Apr 1 0:00s
- 12:00 Russia ANA%sT 1991 Mar 31 2:00s
- 11:00 Russia ANA%sT 1992 Jan 19 2:00s
-- 12:00 Russia ANA%sT
-+ 12:00 Russia ANA%sT 2010 Mar 28 2:00s
-+ 11:00 Russia ANA%sT
-
- # Serbia
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/recipes/tzdata/tzdata_2007k.bb b/recipes/tzdata/tzdata_2007k.bb
deleted file mode 100644
index 7bb66718d6..0000000000
--- a/recipes/tzdata/tzdata_2007k.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require tzdata.inc
-SRC_URI = "http://bent.latency.net/bent/darcs/zoneinfo-${PV}/src/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2009m.bb b/recipes/tzdata/tzdata_2009m.bb
deleted file mode 100644
index 17c2dd4f0c..0000000000
--- a/recipes/tzdata/tzdata_2009m.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require tzdata.inc
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2009o.bb b/recipes/tzdata/tzdata_2009o.bb
deleted file mode 100644
index 17c2dd4f0c..0000000000
--- a/recipes/tzdata/tzdata_2009o.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require tzdata.inc
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2009p.bb b/recipes/tzdata/tzdata_2009p.bb
deleted file mode 100644
index 17c2dd4f0c..0000000000
--- a/recipes/tzdata/tzdata_2009p.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require tzdata.inc
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2009s.bb b/recipes/tzdata/tzdata_2009s.bb
deleted file mode 100644
index 2d406bd094..0000000000
--- a/recipes/tzdata/tzdata_2009s.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require tzdata.inc
-
-SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2010b.bb b/recipes/tzdata/tzdata_2010b.bb
deleted file mode 100644
index 9bfdfba4a3..0000000000
--- a/recipes/tzdata/tzdata_2010b.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require tzdata.inc
-
-SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz \
- file://russia-2010.diff;patch=1"
-PR = "${INC_PR}.1"
diff --git a/recipes/tzdata/tzdata_2010h.bb b/recipes/tzdata/tzdata_2010h.bb
index 6e8e28e00b..1e00fd3d88 100644
--- a/recipes/tzdata/tzdata_2010h.bb
+++ b/recipes/tzdata/tzdata_2010h.bb
@@ -1,7 +1,10 @@
require tzdata.inc
-SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz;name=tar \
-"
+# Note that elsie.nci.nih.gov removes old archives when new is being
+# released. So if this doesn't build for you because of missing source file
+# just bump it to the latest available version, removing old one
+
+PR = "${INC_PR}.0"
SRC_URI[tar.md5sum] = "d384ac091e6d56802f9b3e6b3d3f0f2e"
SRC_URI[tar.sha256sum] = "a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d"