Skip to contentSkip to conversation

tzcode/tzdata: moved to 2012b; changed src location

PATCH In review Frans Meulenbroeks 2 participants 5 messages Mar 11, 2012 – Mar 14, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tzcode/tzdata: moved to 2012b; changed src location

elsie does not respond, so moved to ftp.iana.org (also used by oe-core)

---
 recipes/tzcode/tzcode-native.inc      |    6 +++---
 recipes/tzcode/tzcode-native_2011e.bb |   16 ----------------
 recipes/tzcode/tzcode-native_2012b.bb |   17 +++++++++++++++++
 recipes/tzdata/tzdata.inc             |    4 ++--
 recipes/tzdata/tzdata_2011b.bb        |   11 -----------
 recipes/tzdata/tzdata_2012b.bb        |   11 +++++++++++
 6 files changed, 33 insertions(+), 32 deletions(-)
 delete mode 100644 recipes/tzcode/tzcode-native_2011e.bb
 create mode 100644 recipes/tzcode/tzcode-native_2012b.bb
 delete mode 100644 recipes/tzdata/tzdata_2011b.bb
 create mode 100644 recipes/tzdata/tzdata_2012b.bb
recipes/tzcode/tzcode-native.inc +3 -3
index 78ddec5..94d1bd9 100644
@@ -1,9 +1,9 @@
 DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
-INC_PR = "r4"
+INC_PR = "r5"
 
 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} \
+	ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode-${PV} \
+	ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata-${TZDATA_PV} \
 	"
 
 S = "${WORKDIR}"
recipes/tzcode/tzcode-native_2011e.bb deleted +0 -16
deleted file mode 100644
index 2bf4f4c..0000000
@@ -1,16 +0,0 @@
-require tzcode-native.inc
-
-# Note that elsie.nci.nih.gov removes old versions when new is coming out
-# 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 = "2011e"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[tzcode-2011e.md5sum] = "fbfc05dbf9ebcfe7c4bba18549870173"
-SRC_URI[tzcode-2011e.sha256sum] = "8fb00f8763aa51d83d6f3190d144124bb7176ca829fc08823d6205297bf0426b"
-SRC_URI[tzdata-2011e.md5sum] = "044a07072300a0ee72b046e5a9a4ec90"
-SRC_URI[tzdata-2011e.sha256sum] = "44fef01de4589a4979eb6b5fdbbfd21a3b135852af1ecbfb9e0368ae47392c79"
recipes/tzcode/tzcode-native_2012b.bb new file +17 -0
new file mode 100644
index 0000000..4d3477c
@@ -0,0 +1,17 @@
+require tzcode-native.inc
+
+# Note that elsie.nci.nih.gov removes old versions when new is coming out
+# 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 = "2012b"
+
+PR = "${INC_PR}.0"
+
+SRC_URI[tzcode-2012b.md5sum] = "6137322ffd36e1fd5128885be1c57008"
+SRC_URI[tzcode-2012b.sha256sum] = "4345a2de239a7b6e5ab286052cc269eb07d63798ae14ba715eb4c6bdfa0f3350"
+SRC_URI[tzdata-2012b.md5sum] = "0615fd29def380a917e528433c820368"
+SRC_URI[tzdata-2012b.sha256sum] = "2f9f8e2d1ae087be5917f60c3946e8dc3fe1068d7738c3395f2125135309e745"
+
recipes/tzdata/tzdata.inc +2 -2
index dd5c2c9..af00d4c 100644
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-INC_PR = "r8"
+INC_PR = "r1"
 
 DEFAULT_TIMEZONE ?= "Europe/London"
 
@@ -12,7 +12,7 @@ RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarcti
              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;name=tar"
+SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tar"
 
 S = "${WORKDIR}"
 
recipes/tzdata/tzdata_2011b.bb deleted +0 -11
deleted file mode 100644
index 87ba619..0000000
@@ -1,11 +0,0 @@
-require tzdata.inc
-
-# 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] = "9eaf3ca354c42a32bd28e623539bf0e0"
-SRC_URI[tar.sha256sum] = "ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9"
-
recipes/tzdata/tzdata_2012b.bb new file +11 -0
new file mode 100644
index 0000000..8605331
@@ -0,0 +1,11 @@
+require tzdata.inc
+
+# 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] = "0615fd29def380a917e528433c820368"
+SRC_URI[tar.sha256sum] = "2f9f8e2d1ae087be5917f60c3946e8dc3fe1068d7738c3395f2125135309e745"
+
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 libpng: moved from 1.2.44 to 1.2.48

upstream does not retain old versions so moved to the latest version to make things buildable again

---
 recipes/libpng/libpng_1.2.44.bb |    8 --------
 recipes/libpng/libpng_1.2.48.bb |    9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 recipes/libpng/libpng_1.2.44.bb
 create mode 100644 recipes/libpng/libpng_1.2.48.bb
recipes/libpng/libpng_1.2.44.bb deleted +0 -8
deleted file mode 100644
index 4ba7b20..0000000
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[libpng.md5sum] = "e3ac7879d62ad166a6f0c7441390d12b"
-SRC_URI[libpng.sha256sum] = "b9ab20f1c2c3bf6c4448fd9bd8a4a8905b918114d5fada56c97bb758a17b7215"
recipes/libpng/libpng_1.2.48.bb new file +9 -0
new file mode 100644
index 0000000..7bd3ec3
@@ -0,0 +1,9 @@
+require libpng.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://makefile_fix.patch"
+
+SRC_URI[libpng.md5sum] = "7612af5660cd4b5e8c433ce53bea01a7"
+SRC_URI[libpng.sha256sum] = "f6db51aff81b6920203678b29e8c68a5e3703cf5b39ae5e9e56370d17f31b1c4"
+
Signature · 1 line
1.7.0.4
#3 lore raw
In reply to Frans Meulenbroeks
Quoted 1 line · Frans Meulenbroeks

elsie does not respond, so moved to ftp.iana.org (also used by oe-core)

A quick check and I see that ftp.iana.org does NOT delete old versions so we can finally fix that problem too. Please rework to use the new URL but not to change versions. Thanks!

Signature · 1 line
Tom
#4 lore raw

2012/3/13 Tom Rini <[email protected]>:

Quoted 8 lines · Frans Meulenbroeks
Quoted 2 lines

elsie does not respond, so moved to ftp.iana.org (also used by oe-core)

A quick check and I see that ftp.iana.org does NOT delete old versions so we can finally fix that problem too.  Please rework to use the new URL but not to change versions.  Thanks!

I agree that iana.org does not delete old versions, but it seems better to me to move to the latest version as the tz info in that one is more recent (and presumably better, although I did not check the details; then again the 2012b version does work fine for me).

Frans