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/fixesproto_5.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/fixesproto_5.0.bb')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb index 2c05cf7149..39fb88d84c 100644 --- a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb +++ b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | |||
@@ -12,8 +12,8 @@ LICENSE = "MIT & MIT-style" | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ |
13 | file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" | 13 | file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" |
14 | 14 | ||
15 | CONFLICTS = "fixesext" | 15 | RCONFLICTS_${PN} = "fixesext" |
16 | PR = "r0" | 16 | PR = "r1" |
17 | PE = "1" | 17 | PE = "1" |
18 | 18 | ||
19 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |