summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
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-graphics/matchbox-session/matchbox-session_0.1.bb
parent79e4de84063cdd3d8eab65ae93d9c896829212e8 (diff)
downloadast2050-yocto-poky-85d7c018fe2befacc1b0f81b0ae80e0aa5dc76c1.zip
ast2050-yocto-poky-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-graphics/matchbox-session/matchbox-session_0.1.bb')
-rw-r--r--meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb4
1 files changed, 2 insertions, 2 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 dc10031..3faa16c 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
OpenPOWER on IntegriCloud