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:25:23 +0100 |
| commit | a4ce0e481b84ecb268ace8385ea5dc3e6940c0cc (patch) | |
| tree | 6819dfbdf163c9beb402c13abc02eb1bae6d3bdb /meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | |
| parent | 7e14b780d83e97c76e795e7f1596607abd77df46 (diff) | |
| download | poky-a4ce0e481b84ecb268ace8385ea5dc3e6940c0cc.tar.gz | |
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.
(From OE-Core rev: 45a4e2064991555570f346e0662a57e61c947acf)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ | |||
| 66 | 66 | ||
| 67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" | 67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" |
| 68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" |
| 69 | RREPLACES_${PN}-module-exa = "${PN}" | ||
| 69 | 70 | ||
| 70 | 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" | 71 | 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" |
| 71 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | 72 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" |