summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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:24:58 +0100
commit85d7c018fe2befacc1b0f81b0ae80e0aa5dc76c1 (patch)
tree6e1815023d5a14ee0ad3b043c3265ea88b810421 /meta/recipes-extended
parent79e4de84063cdd3d8eab65ae93d9c896829212e8 (diff)
downloadpoky-85d7c018fe2befacc1b0f81b0ae80e0aa5dc76c1.tar.gz
tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_
(From OE-Core rev: 8f4e7dfd8b60a10411261666b4da2b4aff1c4231) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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"
5LIC_FILES_CHKSUM = "file://asia;beginline=3;endline=4;md5=06468c0e84ef4d4c97045a4a29b08234" 5LIC_FILES_CHKSUM = "file://asia;beginline=3;endline=4;md5=06468c0e84ef4d4c97045a4a29b08234"
6DEPENDS = "tzcode-native" 6DEPENDS = "tzcode-native"
7 7
8PR = "r0" 8PR = "r1"
9 9
10RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ 10RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \
11 timezone-arctic timezone-asia timezone-atlantic \ 11 timezone-arctic timezone-asia timezone-atlantic \
12 timezone-australia timezone-europe timezone-indian \ 12 timezone-australia timezone-europe timezone-indian \
13 timezone-iso3166.tab timezone-pacific timezone-zone.tab" 13 timezone-iso3166.tab timezone-pacific timezone-zone.tab"