From 24c1b8346a2ab8bdea2e140282e33814166d9113 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 21 Dec 2021 23:50:50 +0100 Subject: [PATCH] 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-extended/timezone/tzdata.bb | 7 ------- 1 file changed, 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 \ -" -- 2.40.1