aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-02-04 16:01:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-05 00:24:36 +0000
commit60c30127df63b75d70a61d90c9f9afe0f938dc71 (patch)
tree0ddace833339f5470889a07d58264d929b87d06e /meta/recipes-extended
parentb71294c4decf35d544a2c8adb4e67d141841fc68 (diff)
downloadopenembedded-core-contrib-60c30127df63b75d70a61d90c9f9afe0f938dc71.tar.gz
openembedded-core-contrib-60c30127df63b75d70a61d90c9f9afe0f938dc71.tar.bz2
openembedded-core-contrib-60c30127df63b75d70a61d90c9f9afe0f938dc71.zip
timezone: refactor to simplify maint
move tzcode and tzdata-native into new dir Updates are now limited to the common include file. [v2] Fix UMMARY typ0 in timezone.inc Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/timezone/timezone.inc (renamed from meta/recipes-extended/tzcode/tzcode-native_2018i.bb)21
-rw-r--r--meta/recipes-extended/timezone/tzcode-native.bb17
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb (renamed from meta/recipes-extended/tzdata/tzdata_2018i.bb)12
3 files changed, 23 insertions, 27 deletions
diff --git a/meta/recipes-extended/tzcode/tzcode-native_2018i.bb b/meta/recipes-extended/timezone/timezone.inc
index f056370b4a..696f02da4b 100644
--- a/meta/recipes-extended/tzcode/tzcode-native_2018i.bb
+++ b/meta/recipes-extended/timezone/timezone.inc
@@ -1,10 +1,11 @@
-# note that we allow for us to use data later than our code version
-#
-SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
+SUMMARY = "Timezone data"
+HOMEPAGE = "http://www.iana.org/time-zones"
+SECTION = "base"
LICENSE = "PD & BSD & BSD-3-Clause"
-
LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
+PV = "2018i"
+
SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
"
@@ -16,15 +17,3 @@ SRC_URI[tzcode.sha256sum] = "aaacdb876ca6fb9d58e244b462cbc7578a496b1b10994381b4b
SRC_URI[tzdata.md5sum] = "b3f0a1a789480a036e58466cd0702477"
SRC_URI[tzdata.sha256sum] = "82c45ef84ca3bc01d0a4a397ba8adeb8f7f199c6550740587c6ac5a7108c00d9"
-S = "${WORKDIR}"
-
-inherit native
-
-EXTRA_OEMAKE += "cc='${CC}'"
-
-do_install () {
- install -d ${D}${bindir}/
- install -m 755 zic ${D}${bindir}/
- install -m 755 zdump ${D}${bindir}/
- install -m 755 tzselect ${D}${bindir}/
-}
diff --git a/meta/recipes-extended/timezone/tzcode-native.bb b/meta/recipes-extended/timezone/tzcode-native.bb
new file mode 100644
index 0000000000..e3582ba674
--- /dev/null
+++ b/meta/recipes-extended/timezone/tzcode-native.bb
@@ -0,0 +1,17 @@
+require timezone.inc
+
+#
+SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
+
+S = "${WORKDIR}"
+
+inherit native
+
+EXTRA_OEMAKE += "cc='${CC}'"
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 755 zic ${D}${bindir}/
+ install -m 755 zdump ${D}${bindir}/
+ install -m 755 tzselect ${D}${bindir}/
+}
diff --git a/meta/recipes-extended/tzdata/tzdata_2018i.bb b/meta/recipes-extended/timezone/tzdata.bb
index 4482e89d32..7542ce52d2 100644
--- a/meta/recipes-extended/tzdata/tzdata_2018i.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -1,17 +1,7 @@
-SUMMARY = "Timezone data"
-HOMEPAGE = "http://www.iana.org/time-zones"
-SECTION = "base"
-LICENSE = "PD & BSD & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
+require timezone.inc
DEPENDS = "tzcode-native"
-SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
-UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
-
-SRC_URI[tzdata.md5sum] = "b3f0a1a789480a036e58466cd0702477"
-SRC_URI[tzdata.sha256sum] = "82c45ef84ca3bc01d0a4a397ba8adeb8f7f199c6550740587c6ac5a7108c00d9"
-
inherit allarch
RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \