[oe] [PATCH] tzdata: fix RPROVIDES definitions

Roman I Khimov khimov at altell.ru
Fri Jul 2 14:57:32 UTC 2010


It seems a bit strange for tzdata-smth explicitly rprovide tzdata-smth, most
probably it were timezone-* packages that ought to be rprovided (see
RCONFLICTS in the same .inc).

Signed-off-by: Roman I Khimov <khimov at altell.ru>
---
 recipes/tzdata/tzdata.inc |   56 ++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 1f4dfdb..ac9a6a7 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 DEFAULT_TIMEZONE ?= "Europe/London"
 
@@ -54,54 +54,54 @@ PACKAGE_ARCH = "all"
 # Packages primarily organized by directory with a major city
 # in most time zones in the base package
 
-PACKAGES = "${PN}-dbg tzdata 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 = "${PN}-dbg ${PN} ${PN}-misc ${PN}-posix ${PN}-right ${PN}-africa \
+    ${PN}-americas ${PN}-antarctica ${PN}-arctic ${PN}-asia \
+    ${PN}-atlantic ${PN}-australia ${PN}-europe ${PN}-pacific"
 
 ALLOW_EMPTY_${PN}-dbg = "1"
 
-FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
-RPROVIDES_tzdata-africa = "tzdata-africa"
+FILES_${PN}-africa += "${datadir}/zoneinfo/Africa/*"
+RPROVIDES_${PN}-africa = "timezone-africa"
 
-FILES_tzdata-americas += "${datadir}/zoneinfo/America/*  \
+FILES_${PN}-americas += "${datadir}/zoneinfo/America/*  \
                 ${datadir}/zoneinfo/US/*                \
                 ${datadir}/zoneinfo/Brazil/*            \
                 ${datadir}/zoneinfo/Canada/*            \
                 ${datadir}/zoneinfo/Mexico/*            \
                 ${datadir}/zoneinfo/Chile/*"
-RPROVIDES_tzdata-americas = "tzdata-americas"
+RPROVIDES_${PN}-americas = "timezone-americas"
 
-FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*"
-RPROVIDES_tzdata-antarctica = "tzdata-antarctica"
+FILES_${PN}-antarctica += "${datadir}/zoneinfo/Antarctica/*"
+RPROVIDES_${PN}-antarctica = "timezone-antarctica"
 
-FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*"
-RPROVIDES_tzdata-arctic = "tzdata-arctic"
+FILES_${PN}-arctic += "${datadir}/zoneinfo/Arctic/*"
+RPROVIDES_${PN}-arctic = "timezone-arctic"
 
-FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/*        \
+FILES_${PN}-asia += "${datadir}/zoneinfo/Asia/*        \
                 ${datadir}/zoneinfo/Indian/*            \
                 ${datadir}/zoneinfo/Mideast/*"
-RPROVIDES_tzdata-asia = "tzdata-asia"
+RPROVIDES_${PN}-asia = "timezone-asia"
 
-FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*"
-RPROVIDES_tzdata-atlantic = "tzdata-atlantic"
+FILES_${PN}-atlantic += "${datadir}/zoneinfo/Atlantic/*"
+RPROVIDES_${PN}-atlantic = "timezone-atlantic"
 
-FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*"
-RPROVIDES_tzdata-australia = "tzdata-australia"
+FILES_${PN}-australia += "${datadir}/zoneinfo/Australia/*"
+RPROVIDES_${PN}-australia = "timezone-australia"
 
-FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*"
-RPROVIDES_tzdata-europe = "tzdata-europe"
+FILES_${PN}-europe += "${datadir}/zoneinfo/Europe/*"
+RPROVIDES_${PN}-europe = "timezone-europe"
 
-FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*"
-RPROVIDES_tzdata-pacific = "tzdata-pacific"
+FILES_${PN}-pacific += "${datadir}/zoneinfo/Pacific/*"
+RPROVIDES_${PN}-pacific = "timezone-pacific"
 
-FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*"
-RPROVIDES_tzdata-posix = "tzdata-posix"
+FILES_${PN}-posix += "${datadir}/zoneinfo/posix/*"
+RPROVIDES_${PN}-posix = "timezone-posix"
 
-FILES_tzdata-right += "${datadir}/zoneinfo/right/*"
-RPROVIDES_tzdata-right = "tzdata-right"
+FILES_${PN}-right += "${datadir}/zoneinfo/right/*"
+RPROVIDES_${PN}-right = "timezone-right"
 
 
-FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba           \
+FILES_${PN}-misc += "${datadir}/zoneinfo/Cuba           \
                 ${datadir}/zoneinfo/Egypt                \
                 ${datadir}/zoneinfo/Eire                 \
                 ${datadir}/zoneinfo/Factory              \
@@ -119,7 +119,7 @@ FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba           \
                 ${datadir}/zoneinfo/Portugal             \
                 ${datadir}/zoneinfo/Singapore            \
                 ${datadir}/zoneinfo/Turkey"
-RPROVIDES_tzdata-misc = "tzdata-misc"
+RPROVIDES_${PN}-misc = "timezone-misc"
 
 
 FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
-- 
1.5.6.5





More information about the Openembedded-devel mailing list