]> code.ossystems Code Review - openembedded-core.git/commitdiff
tzdata: Remove no longer relevant RCONFLICTS:${PN}
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Tue, 21 Dec 2021 22:50:50 +0000 (23:50 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 22 Dec 2021 23:09:22 +0000 (23:09 +0000)
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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/timezone/tzdata.bb

index cc1caff124bffd61e6a67518a5c5e8e719c8c5ac..7f4322d8671e165eedca8bdc64a53a6d40305020 100644 (file)
@@ -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 \
-"