| Message ID | 1346841036-9897-1-git-send-email-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 45a4e2064991555570f346e0662a57e61c947acf |
| Headers | show |
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 b588c11..b4a348c 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,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r5" - +PR = "r6" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 404c488..6133344 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -66,6 +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}" 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"
On 09/05/2012 03:30 AM, Ross Burton wrote: > As the file moved from xserver-xorg to xserver-xorg-module-exa, the latter needs > to "replace" the former to ensure a smooth migration when upgrading the > packages. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +-- > meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > 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 b588c11..b4a348c 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,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \ > SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" > SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" > > -PR = "r5" > - > +PR = "r6" > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > index 404c488..6133344 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > @@ -66,6 +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}" > > 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" > Merged into OE-Core Thanks Sau!
As the file moved from xserver-xorg to xserver-xorg-module-exa, the latter needs to "replace" the former to ensure a smooth migration when upgrading the packages. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +-- meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)