From fbcda6eff010e0a39cc0145a514e7de99f475145 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Jun 2012 20:08:18 +0200 Subject: recipes: replace CONFLICTS with RCONFLICTS_${PN} Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb index 5daeb72762..e1a7e0ef76 100644 --- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb +++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb @@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "x11" DEPENDS = "" -CONFLICTS = "matchbox-common" +RCONFLICTS_${PN} = "matchbox-common" SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" PV = "0.1+git${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" -- cgit 1.2.3-korg