* [PATCH] xserver-xorg: Remove RCONFLICTS against xserver-xorg
@ 2012-09-28 13:31 Otavio Salvador
2012-10-02 14:47 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Otavio Salvador @ 2012-09-28 13:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Otavio Salvador
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"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] xserver-xorg: Remove RCONFLICTS against xserver-xorg
2012-09-28 13:31 [PATCH] xserver-xorg: Remove RCONFLICTS against xserver-xorg Otavio Salvador
@ 2012-10-02 14:47 ` Saul Wold
2012-10-02 14:59 ` Otavio Salvador
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2012-10-02 14:47 UTC (permalink / raw)
To: Otavio Salvador; +Cc: openembedded-core
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-02 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-28 13:31 [PATCH] xserver-xorg: Remove RCONFLICTS against xserver-xorg Otavio Salvador
2012-10-02 14:47 ` Saul Wold
2012-10-02 14:59 ` Otavio Salvador
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox