summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@betafive.co.uk>2019-04-02 15:15:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-03 14:50:13 +0100
commitb53a83c2a39b3375c4de962314dd77effc9727c4 (patch)
treea6cf70bccd05c96187f55fe5455ec49cb0f20457
parenta397fd17e42d745e6a23dee86e82b887f3d25ccd (diff)
downloadpoky-b53a83c2a39b3375c4de962314dd77effc9727c4.tar.gz
tzdata: Install everything by default
tzdata is converted to an empty meta package which pulls in all subpackages. The subpackages are defined in a TZ_PACKAGES variable so that we don't have to repeat ourselves. The timezones and conffiles which were in the tzdata package are moved to a new 'tzdata-core' package. (From OE-Core rev: 2af4d6eb2526d60b26bc5128068541ff3350fb58) Signed-off-by: Paul Barker <paul@betafive.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb16
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index 7542ce52d2..82fe369baa 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -80,9 +80,11 @@ pkg_postinst_${PN} () {
80# Packages primarily organized by directory with a major city 80# Packages primarily organized by directory with a major city
81# in most time zones in the base package 81# in most time zones in the base package
82 82
83PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 83TZ_PACKAGES = " \
84 tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \
84 tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ 85 tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
85 tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" 86 tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
87PACKAGES = "${TZ_PACKAGES} ${PN}"
86 88
87FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" 89FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
88RPROVIDES_tzdata-africa = "tzdata-africa" 90RPROVIDES_tzdata-africa = "tzdata-africa"
@@ -124,7 +126,6 @@ RPROVIDES_tzdata-posix = "tzdata-posix"
124FILES_tzdata-right += "${datadir}/zoneinfo/right/*" 126FILES_tzdata-right += "${datadir}/zoneinfo/right/*"
125RPROVIDES_tzdata-right = "tzdata-right" 127RPROVIDES_tzdata-right = "tzdata-right"
126 128
127
128FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ 129FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
129 ${datadir}/zoneinfo/Egypt \ 130 ${datadir}/zoneinfo/Egypt \
130 ${datadir}/zoneinfo/Eire \ 131 ${datadir}/zoneinfo/Eire \
@@ -145,8 +146,8 @@ FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
145 ${datadir}/zoneinfo/Turkey" 146 ${datadir}/zoneinfo/Turkey"
146RPROVIDES_tzdata-misc = "tzdata-misc" 147RPROVIDES_tzdata-misc = "tzdata-misc"
147 148
148 149FILES_tzdata-core += " \
149FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ 150 ${datadir}/zoneinfo/Pacific/Honolulu \
150 ${datadir}/zoneinfo/America/Anchorage \ 151 ${datadir}/zoneinfo/America/Anchorage \
151 ${datadir}/zoneinfo/America/Los_Angeles \ 152 ${datadir}/zoneinfo/America/Los_Angeles \
152 ${datadir}/zoneinfo/America/Denver \ 153 ${datadir}/zoneinfo/America/Denver \
@@ -201,5 +202,8 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
201 ${datadir}/zoneinfo/iso3166.tab \ 202 ${datadir}/zoneinfo/iso3166.tab \
202 ${datadir}/zoneinfo/Etc/*" 203 ${datadir}/zoneinfo/Etc/*"
203 204
204CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }" 205CONFFILES_tzdata-core += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }"
205CONFFILES_${PN} += "${sysconfdir}/localtime" 206CONFFILES_tzdata-core += "${sysconfdir}/localtime"
207
208ALLOW_EMPTY_${PN} = "1"
209RDEPENDS_${PN} = "${TZ_PACKAGES}"