aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
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-graphics
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-graphics')
-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
2 files changed, 4 insertions, 4 deletions
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"
LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://matchbox-session"
S = "${WORKDIR}"
-PR = "r1"
+PR = "r2"
inherit update-alternatives
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"
HOMEPAGE = "http://www.yoctoproject.org"
BUGTRACKER = "http://bugzilla.pokylinux.org"
-PR = "r1"
+PR = "r2"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://mini-x-session"
S = "${WORKDIR}"