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/compositeproto_0.4.2.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/compositeproto_0.4.2.bb')
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb index 093ee9924c..adfee26306 100644 --- a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb +++ b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb | |||
| @@ -10,10 +10,10 @@ LICENSE = "MIT & MIT-style" | |||
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ |
| 11 | file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" | 11 | file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" |
| 12 | 12 | ||
| 13 | CONFLICTS = "compositeext" | 13 | RCONFLICTS_${PN} = "compositeext" |
| 14 | BBCLASSEXTEND = "native" | 14 | BBCLASSEXTEND = "native" |
| 15 | 15 | ||
| 16 | PR = "r0" | 16 | PR = "r1" |
| 17 | PE = "1" | 17 | PE = "1" |
| 18 | 18 | ||
| 19 | SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" | 19 | SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" |