diff options
| author |   Paul Barker <paul@betafive.co.uk> | 2019-04-02 15:15:38 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-03 14:46:57 +0100 |
| commit | 2af4d6eb2526d60b26bc5128068541ff3350fb58 (patch) | |
| tree | a38eb8a73cc19cca3da8ac3ee1b943f731a161dd | |
| parent | 13e45fffb66c7cb7ba0d07bed063c0c5ce57004b (diff) | |
| download | openembedded-core-contrib-2af4d6eb2526d60b26bc5128068541ff3350fb58.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.
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.bb | 16 |
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}" |