diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-09-05 11:30:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-05 22:24:30 +0100 |
| commit | 45a4e2064991555570f346e0662a57e61c947acf (patch) | |
| tree | 372ab548c28b5fb909b4b07ed6f551e0f5371b1d /meta | |
| parent | 1c2afda021f7abf88bc08400beba53c603912382 (diff) | |
| download | openembedded-core-45a4e2064991555570f346e0662a57e61c947acf.tar.gz openembedded-core-45a4e2064991555570f346e0662a57e61c947acf.tar.bz2 openembedded-core-45a4e2064991555570f346e0662a57e61c947acf.zip | |
xserver-xorg-common: add RREPLACES on xserver-xorg to -module-exa
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 | ||||
| -rw-r--r-- | 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 b588c119d0..b4a348c1aa 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 404c48851e..6133344b38 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" |