diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-28 10:31:21 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 15:19:43 +0100 |
commit | 1ed2073a01d9d649bd61ed30f2991bb5f351aa20 (patch) | |
tree | 183c795477737dab2e0c36c54bc73de862fe36b7 /meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | |
parent | 15216fc1ec10c93d009f1a6262e90cada5254697 (diff) | |
download | poky-1ed2073a01d9d649bd61ed30f2991bb5f351aa20.tar.gz |
xserver-xorg: Remove RCONFLICTS against xserver-xorg
When merging the xserver-xorg fix the to use RDEPENDS in
xserver-xorg-module-exa the RCONFLICTS has not been removed by
mistake. This drops the RCONFLICTS to properly fix it.
(From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb index 2512fb2351..a219f814ac 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | |||
@@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \ | |||
10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" | 10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" |
11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" | 11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" |
12 | 12 | ||
13 | PR = "r9" | 13 | PR = "r10" |