summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1# note that we allow for us to use data later than our code version 1SUMMARY = "Timezone data"
2# 2HOMEPAGE = "http://www.iana.org/time-zones"
3SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" 3SECTION = "base"
4LICENSE = "PD & BSD & BSD-3-Clause" 4LICENSE = "PD & BSD & BSD-3-Clause"
5
6LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
7 6
7PV = "2018i"
8
8SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ 9SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
9 http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ 10 http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
10 " 11 "
@@ -16,15 +17,3 @@ SRC_URI[tzcode.sha256sum] = "aaacdb876ca6fb9d58e244b462cbc7578a496b1b10994381b4b
16SRC_URI[tzdata.md5sum] = "b3f0a1a789480a036e58466cd0702477" 17SRC_URI[tzdata.md5sum] = "b3f0a1a789480a036e58466cd0702477"
17SRC_URI[tzdata.sha256sum] = "82c45ef84ca3bc01d0a4a397ba8adeb8f7f199c6550740587c6ac5a7108c00d9" 18SRC_URI[tzdata.sha256sum] = "82c45ef84ca3bc01d0a4a397ba8adeb8f7f199c6550740587c6ac5a7108c00d9"
18 19
19S = "${WORKDIR}"
20
21inherit native
22
23EXTRA_OEMAKE += "cc='${CC}'"
24
25do_install () {
26 install -d ${D}${bindir}/
27 install -m 755 zic ${D}${bindir}/
28 install -m 755 zdump ${D}${bindir}/
29 install -m 755 tzselect ${D}${bindir}/
30}
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 @@
1require timezone.inc
2
3#
4SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
5
6S = "${WORKDIR}"
7
8inherit native
9
10EXTRA_OEMAKE += "cc='${CC}'"
11
12do_install () {
13 install -d ${D}${bindir}/
14 install -m 755 zic ${D}${bindir}/
15 install -m 755 zdump ${D}${bindir}/
16 install -m 755 tzselect ${D}${bindir}/
17}
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 @@
1SUMMARY = "Timezone data" 1require timezone.inc
2HOMEPAGE = "http://www.iana.org/time-zones"
3SECTION = "base"
4LICENSE = "PD & BSD & BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
6 2
7DEPENDS = "tzcode-native" 3DEPENDS = "tzcode-native"
8 4
9SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
10UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
11
12SRC_URI[tzdata.md5sum] = "b3f0a1a789480a036e58466cd0702477"
13SRC_URI[tzdata.sha256sum] = "82c45ef84ca3bc01d0a4a397ba8adeb8f7f199c6550740587c6ac5a7108c00d9"
14
15inherit allarch 5inherit allarch
16 6
17RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \ 7RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \