diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-06-16 20:08:18 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-18 13:18:40 +0100 |
| commit | fbcda6eff010e0a39cc0145a514e7de99f475145 (patch) | |
| tree | a64d1731bd75f4f5951ec43ba73c4870ee896faa /meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb | |
| parent | abd5d5a712686a379a1a1da29d78a0f374f13e33 (diff) | |
| download | openembedded-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-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb')
| -rw-r--r-- | meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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" |