summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2012c.bb4
-rw-r--r--meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb4
-rw-r--r--meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb4
3 files changed, 6 insertions, 6 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"
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index dc10031b3c..3faa16c099 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -6,12 +6,12 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" 6LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea"
7 7
8SECTION = "x11" 8SECTION = "x11"
9RCONFLICTS = "matchbox-common" 9RCONFLICTS_${PN} = "matchbox-common"
10 10
11SRC_URI = "file://matchbox-session" 11SRC_URI = "file://matchbox-session"
12S = "${WORKDIR}" 12S = "${WORKDIR}"
13 13
14PR = "r1" 14PR = "r2"
15 15
16inherit update-alternatives 16inherit update-alternatives
17 17
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index 8f28d030a6..bc9368af10 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Mini X session files for poky"
2HOMEPAGE = "http://www.yoctoproject.org" 2HOMEPAGE = "http://www.yoctoproject.org"
3BUGTRACKER = "http://bugzilla.pokylinux.org" 3BUGTRACKER = "http://bugzilla.pokylinux.org"
4 4
5PR = "r1" 5PR = "r2"
6 6
7LICENSE = "GPLv2" 7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487" 8LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
9 9
10SECTION = "x11" 10SECTION = "x11"
11RCONFLICTS = "matchbox-common" 11RCONFLICTS_${PN} = "matchbox-common"
12 12
13SRC_URI = "file://mini-x-session" 13SRC_URI = "file://mini-x-session"
14S = "${WORKDIR}" 14S = "${WORKDIR}"