[OE-core] [PATCH 1/1] tzdata: Install everything by default
Mark Hatle
mark.hatle at windriver.com
Tue Apr 2 16:29:32 UTC 2019
On 4/2/19 9:15 AM, Paul Barker wrote:
> 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.
Is there any type of 'RREPLACES' or anything that should be added so previous
users of tzdata-all get tzdata in a package upgrade?
(or is it ROBSOLETES, or.. I can never remember..)
--Mark
> Signed-off-by: Paul Barker <paul at betafive.co.uk>
> ---
> meta/recipes-extended/timezone/tzdata.bb | 16 ++++++++++------
> 1 file 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}"
>
More information about the Openembedded-core
mailing list