tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Fri, 8 Oct 2010 10:05:53 +0000 (12:05 +0200)
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Fri, 8 Oct 2010 10:06:01 +0000 (12:06 +0200)
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
recipes/tzdata/tzdata.inc

index 1f4dfdb..9d71354 100644 (file)
@@ -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"