From fbcda6eff010e0a39cc0145a514e7de99f475145 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Sat, 16 Jun 2012 20:08:18 +0200
Subject: recipes: replace CONFLICTS with RCONFLICTS_${PN}

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/db/db_5.3.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'meta/recipes-support/db')

diff --git a/meta/recipes-support/db/db_5.3.15.bb b/meta/recipes-support/db/db_5.3.15.bb
index 9d2bbe5e46..a34ad24a74 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.15.bb
@@ -13,8 +13,8 @@ DESCRIPTION = "Berkeley DB v5."
 HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
-CONFLICTS = "db3"
-PR = "r5"
+RCONFLICTS_${PN} = "db3"
+PR = "r6"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
 SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
-- 
cgit 1.2.3-korg