Patchwork xserver-xorg: Remove RCONFLICTS against xserver-xorg

login
register
mail settings
Submitter Otavio Salvador
Date Sept. 28, 2012, 1:31 p.m.
Message ID <1348839081-7511-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/37433/
State Accepted
Commit d83e218dc480a09befddf8b934d774519cdbacb5
Headers show

Comments

Otavio Salvador - Sept. 28, 2012, 1:31 p.m.
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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 -
 .../xorg-xserver/xserver-xorg_1.11.2.bb            |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
Saul Wold - Oct. 2, 2012, 2:47 p.m.
On 09/28/2012 06:31 AM, Otavio Salvador wrote:
> 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.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 -
>   .../xorg-xserver/xserver-xorg_1.11.2.bb            |    2 +-
>   2 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 9b474de..bea0252 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \
>
>   RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
>   RDEPENDS_${PN}-xvfb += "xkeyboard-config"
> -RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
>   RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
>
>   FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
> 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 2512fb2..a219f81 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 \
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r9"
> +PR = "r10"
>
Merged into OE-Core

Sorry about the original mis-merge!

Thanks
	Sau!
Otavio Salvador - Oct. 2, 2012, 2:59 p.m.
On Tue, Oct 2, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
> Merged into OE-Core
>
> Sorry about the original mis-merge!

Thanks by merging both changes.

mis-merge happens, good we found it fast :)

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9b474de..bea0252 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -66,7 +66,6 @@  PACKAGES =+ "${PN}-security-policy \
 
 RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
 RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
 RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
 
 FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
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 2512fb2..a219f81 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 \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r9"
+PR = "r10"