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-graphics/xorg-proto/resourceproto_1.2.0.bb | |
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-graphics/xorg-proto/resourceproto_1.2.0.bb')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb index 92c37c6f62..08b610aea5 100644 --- a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb +++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb | |||
@@ -9,9 +9,9 @@ see and monitor X resource usage of various clients." | |||
9 | LICENSE = "MIT" | 9 | LICENSE = "MIT" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" |
11 | 11 | ||
12 | CONFLICTS = "resourceext" | 12 | RCONFLICTS_${PN} = "resourceext" |
13 | 13 | ||
14 | PR = "r0" | 14 | PR = "r1" |
15 | PE = "1" | 15 | PE = "1" |
16 | 16 | ||
17 | SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" | 17 | SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" |