summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/timezone/tzdata.bb
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 /meta/recipes-extended/timezone/tzdata.bb
parenta397fd17e42d745e6a23dee86e82b887f3d25ccd (diff)
downloadpoky-b53a83c2a39b3375c4de962314dd77effc9727c4.tar.gz
poky-b53a83c2a39b3375c4de962314dd77effc9727c4.tar.bz2
poky-b53a83c2a39b3375c4de962314dd77effc9727c4.zip
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>
Diffstat (limited to 'meta/recipes-extended/timezone/tzdata.bb')
-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} () {
# Packages primarily organized by directory with a major city
# in most time zones in the base package
-PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
+TZ_PACKAGES = " \
+ tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \
tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
+PACKAGES = "${TZ_PACKAGES} ${PN}"
FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
RPROVIDES_tzdata-africa = "tzdata-africa"
@@ -124,7 +126,6 @@ RPROVIDES_tzdata-posix = "tzdata-posix"
FILES_tzdata-right += "${datadir}/zoneinfo/right/*"
RPROVIDES_tzdata-right = "tzdata-right"
-
FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
${datadir}/zoneinfo/Egypt \
${datadir}/zoneinfo/Eire \
@@ -145,8 +146,8 @@ FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
${datadir}/zoneinfo/Turkey"
RPROVIDES_tzdata-misc = "tzdata-misc"
-
-FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
+FILES_tzdata-core += " \
+ ${datadir}/zoneinfo/Pacific/Honolulu \
${datadir}/zoneinfo/America/Anchorage \
${datadir}/zoneinfo/America/Los_Angeles \
${datadir}/zoneinfo/America/Denver \
@@ -201,5 +202,8 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
${datadir}/zoneinfo/iso3166.tab \
${datadir}/zoneinfo/Etc/*"
-CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }"
-CONFFILES_${PN} += "${sysconfdir}/localtime"
+CONFFILES_tzdata-core += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }"
+CONFFILES_tzdata-core += "${sysconfdir}/localtime"
+
+ALLOW_EMPTY_${PN} = "1"
+RDEPENDS_${PN} = "${TZ_PACKAGES}"