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:24:58 +0100 |
| commit | 79e4de84063cdd3d8eab65ae93d9c896829212e8 (patch) | |
| tree | 215ff9e216b02a672eddb0d0708c370f77805e9f /meta/recipes-sato | |
| parent | 0529f93440b2d67af8b2272b4d18220ae94e91d8 (diff) | |
| download | poky-79e4de84063cdd3d8eab65ae93d9c896829212e8.tar.gz | |
recipes: replace CONFLICTS with RCONFLICTS_${PN}
(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -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" | |||
| 7 | 7 | ||
| 8 | SECTION = "x11" | 8 | SECTION = "x11" |
| 9 | DEPENDS = "" | 9 | DEPENDS = "" |
| 10 | CONFLICTS = "matchbox-common" | 10 | RCONFLICTS_${PN} = "matchbox-common" |
| 11 | 11 | ||
| 12 | SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" | 12 | SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" |
| 13 | PV = "0.1+git${SRCPV}" | 13 | PV = "0.1+git${SRCPV}" |
| 14 | PR = "r0" | 14 | PR = "r1" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" | 16 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
| 17 | 17 | ||