diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-12-21 23:50:50 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-22 23:11:45 +0000 |
| commit | 9b99eb9e361e730a3c1007d62475053835f6b155 (patch) | |
| tree | aa7b6b2314506a63af58499a25ada50a1200bbb0 /meta/recipes-extended/timezone/tzdata.bb | |
| parent | 32db0d80d7658d64c844f108c40f9f0b18d58c68 (diff) | |
| download | poky-9b99eb9e361e730a3c1007d62475053835f6b155.tar.gz poky-9b99eb9e361e730a3c1007d62475053835f6b155.tar.bz2 poky-9b99eb9e361e730a3c1007d62475053835f6b155.zip | |
tzdata: Remove no longer relevant RCONFLICTS:${PN}
Remove RCONFLICTS:${PN} for the packages from the timezones recipe,
which was replaced by tzdata in OE-Classic in 2007...
Also remove a commented timezone (pacificnew), which has actually never
been added to TZONES.
(From OE-Core rev: 24c1b8346a2ab8bdea2e140282e33814166d9113)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
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.bb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index cc1caff124..7f4322d867 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb @@ -13,7 +13,6 @@ TZONES = " \ africa antarctica asia australasia europe northamerica southamerica \ factory etcetera backward \ " -# pacificnew # "slim" is the default since 2020b # "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql @@ -201,9 +200,3 @@ CONFFILES:tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone" ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN} = "${TZ_PACKAGES}" -RCONFLICTS:${PN} = " \ - timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic timezone-australia \ - timezone-europe timezone-indian timezone-iso3166.tab timezone-pacific \ - timezone-zone.tab \ -" |