summaryrefslogtreecommitdiff
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-16 20:08:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:18:40 +0100
commitfbcda6eff010e0a39cc0145a514e7de99f475145 (patch)
treea64d1731bd75f4f5951ec43ba73c4870ee896faa /meta/recipes-support
parentabd5d5a712686a379a1a1da29d78a0f374f13e33 (diff)
downloadopenembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.gz
openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.bz2
openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.zip
recipes: replace CONFLICTS with RCONFLICTS_${PN}
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/db/db_5.3.15.bb4
1 files changed, 2 insertions, 2 deletions
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=.."