aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/tzdata
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-10-08 12:05:53 +0200
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-10-08 12:06:01 +0200
commitd533262dfe6845cf82386493916dfc021c3545ac (patch)
tree053cc6cc0d51fc5cd52d1c3444bf6179336e1bb2 /recipes/tzdata
parent43d59cb7fe904f9d61cbf1a4dad33fac1ff7be08 (diff)
downloadopenembedded-d533262dfe6845cf82386493916dfc021c3545ac.tar.gz
openembedded-d533262dfe6845cf82386493916dfc021c3545ac.tar.bz2
openembedded-d533262dfe6845cf82386493916dfc021c3545ac.zip
tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/tzdata')
-rw-r--r--recipes/tzdata/tzdata.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 1f4dfdb7aa..9d7135411f 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,11 +3,11 @@ SECTION = "base"
PRIORITY = "optional"
DEPENDS = "tzcode-native"
-INC_PR = "r7"
+INC_PR = "r8"
DEFAULT_TIMEZONE ?= "Europe/London"
-RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
+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"