tzdata/tzcode: leave only latest version

I don't see any value in old tzdata/tzcode-native recipes as tzcode is only
used to compile tzdata and compiled tzdata should be compatible with any
version of glibc and it's good to have it latest. So I think we should only
leave latest tzdata version and move that forward whenever someone discovers
that elsie.nci.nih.gov dropped that version. Same for tzcode.

Add comments to unconditionally move that versions forward whenever there is
a new release.

Signed-off-by: Roman I Khimov <khimov@altell.ru>

4 files changed, 13 insertions, 20 deletions

diff --git a/recipes/tzcode/tzcode-native.inc b/recipes/tzcode/tzcode-native.inc
index 0d6bd5b767..a3a16da3d6 100644
--- a/recipes/tzcode/tzcode-native.inc
+++ b/recipes/tzcode/tzcode-native.inc
@@ -1,5 +1,10 @@
 DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
-INC_PR = "r2"
+INC_PR = "r3"
+
+SRC_URI = " \
+	ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz;name=tzcode-${PV} \
+	ftp://elsie.nci.nih.gov/pub/tzdata${TZDATA_PV}.tar.gz;name=tzdata-${TZDATA_PV} \
+	"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/tzcode/tzcode-native_2007k.bb b/recipes/tzcode/tzcode-native_2007k.bb
deleted file mode 100644
index fe0fb87a9a..0000000000
--- a/recipes/tzcode/tzcode-native_2007k.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require tzcode-native.inc
-SRC_URI = "\
-  http://bent.latency.net/bent/darcs/zoneinfo-${PV}/src/tzcode${PV}.tar.gz \
-  http://bent.latency.net/bent/darcs/zoneinfo-${PV}/src/tzdata${PV}.tar.gz \
-"
-
-PR = "${INC_PR}.0"
diff --git a/recipes/tzcode/tzcode-native_2009k.bb b/recipes/tzcode/tzcode-native_2009k.bb
deleted file mode 100644
index 632dc8456d..0000000000
--- a/recipes/tzcode/tzcode-native_2009k.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require tzcode-native.inc
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
-           ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz \
-	  "
-PR = "${INC_PR}.1"
diff --git a/recipes/tzcode/tzcode-native_2010f.bb b/recipes/tzcode/tzcode-native_2010f.bb
index 937726f532..f2fbffdb70 100644
--- a/recipes/tzcode/tzcode-native_2010f.bb
+++ b/recipes/tzcode/tzcode-native_2010f.bb
@@ -1,13 +1,13 @@
 require tzcode-native.inc
 
 # Note that elsie.nci.nih.gov removes old versions when new is coming out
-# Other tzcode/tzdata recipes use Gentoo mirrors, but that is unreliable
-# wrt older versions too. If you find any stable tzdata/tzcode mirror, please
-# fix this URLs
-SRC_URI = " \
-	ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz;name=tzcode-${PV} \
-	ftp://elsie.nci.nih.gov/pub/tzdata2010h.tar.gz;name=tzdata-2010h \
-	"
+# So if this doesn't build for you because of missing source file, just
+# bump it to the latest available version, removing old one
+# Also, tzdata (and it is needed to build tzcode) version can differ from
+# tzcode version, thus this variable
+
+TZDATA_PV = "2010h"
+
 SRC_URI[tzcode-2010f.md5sum] = "e530cc9bbdfd5e8c1eac21a68f4d5656"
 SRC_URI[tzcode-2010f.sha256sum] = "651d866c91ada925b4ac9491e69ebd5c355c46b2c01dd1741b5e6a609d93eb1e"
 SRC_URI[tzdata-2010h.md5sum] = "d384ac091e6d56802f9b3e6b3d3f0f2e"