summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2008-03-18 22:03:33 +0000
committerHolger Freyther <zecke@selfish.org>2008-03-18 22:03:33 +0000
commit40faec06b8fac7dd87a1dc0ed25d8d9584a375cc (patch)
tree828e8b42f9cbc4d6ee9f759772a5e74ece1a9ba5
parent5720e8d30a3ebb334540a295eff7c78216759ef8 (diff)
tzdata: Both tzdata and tzdata-dbg provided tzdata, ipkg picked tzdata-dbg. Kill the -dbg package, try to provide a upgrade path
The tzdata-dbg package was empty but provided "tzdata". The tzdata package was not empty and provided "tzdata" as well ipkg picked tzdata-dbg resulting in files like /usr/share/zoneinfo/America/New_York missing from the image. Kill the -dbg package, set RREPLACES on the tzdata package, I don't know how to force the update for people that have tzdata-dbg already deployed.
-rw-r--r--packages/tzdata/tzdata_2007k.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb
index 2fbe9ac884..fde929de07 100644
--- a/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
DEPENDS = "tzcode-native"
-PR = "r1"
+PR = "r2"
PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
@@ -14,6 +14,8 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
+RREPLACES_tzdata = "tzdata-dbg"
+
SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
S = "${WORKDIR}"
@@ -42,7 +44,7 @@ do_install () {
# 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 \
+PACKAGES = "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"