| Submitter | Saul Wold |
|---|---|
| Date | Sept. 18, 2012, 12:17 a.m. |
| Message ID | <1347927458-21623-2-git-send-email-sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/36693/ |
| State | Accepted |
| Commit | 467c59495d83748d35846e8b37548182fea99cbf |
| Headers | show |
Comments
Hello Saul,
On Mon, Sep 17, 2012 at 9:17 PM, Saul Wold <sgw@linux.intel.com> wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
I understand the patch but from the description it is not clear why it
is need. Please clarify it in the commit log.
On 09/17/2012 07:40 PM, Otavio Salvador wrote: > Hello Saul, > > On Mon, Sep 17, 2012 at 9:17 PM, Saul Wold <sgw@linux.intel.com> wrote: >> Signed-off-by: Saul Wold <sgw@linux.intel.com> > > I understand the patch but from the description it is not clear why it > is need. Please clarify it in the commit log. > I might need Ross or Paul to help with that, I was just implementing and posting the solution based on other emails. Sau!
Patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc index c71896a..35cb33a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc @@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r7" +PR = "r8" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 210abad..643ca70 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \ RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RREPLACES_${PN}-module-exa = "${PN}" +RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})" 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" FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
Signed-off-by: Saul Wold <sgw@linux.intel.com> --- .../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)