Skip to contentSkip to conversation

tzdata: Remove no longer relevant RCONFLICTS:${PN}

PATCH New Peter Kjellerstedt 1 participant 1 message Dec 21, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

These changes were part of the second version of the patches I sent earlier, but the first version of those patches was actually merged instead.

 meta/recipes-extended/timezone/tzdata.bb | 7 -------
 1 file changed, 7 deletions(-)
meta/recipes-extended/timezone/tzdata.bb +0 -7
index cc1caff124..7f4322d867 100644
@@ -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 \
-"