summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/tzdata
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-16 20:08:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:18:53 +0100
commit8f4e7dfd8b60a10411261666b4da2b4aff1c4231 (patch)
tree4e7911c020b18af810cc0f698b6638e183f5fd43 /meta/recipes-extended/tzdata
parentfbcda6eff010e0a39cc0145a514e7de99f475145 (diff)
downloadopenembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.tar.gz
openembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.tar.bz2
openembedded-core-8f4e7dfd8b60a10411261666b4da2b4aff1c4231.zip
tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/tzdata')
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2012c.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/tzdata/tzdata_2012c.bb b/meta/recipes-extended/tzdata/tzdata_2012c.bb
index fab8e01411..bce787f4a9 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012c.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012c.bb
@@ -5,9 +5,9 @@ LICENSE = "PD"
LIC_FILES_CHKSUM = "file://asia;beginline=3;endline=4;md5=06468c0e84ef4d4c97045a4a29b08234"
DEPENDS = "tzcode-native"
-PR = "r0"
+PR = "r1"
-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"