summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-05 10:30:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 21:25:23 (GMT)
commita4ce0e481b84ecb268ace8385ea5dc3e6940c0cc (patch)
tree6819dfbdf163c9beb402c13abc02eb1bae6d3bdb
parent7e14b780d83e97c76e795e7f1596607abd77df46 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc3
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc1
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 \
8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" 9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
10 10
11PR = "r5" 11PR = "r6"
12
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 \
66 66
67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" 67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68RDEPENDS_${PN}-xvfb += "xkeyboard-config" 68RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69RREPLACES_${PN}-module-exa = "${PN}"
69 70
70FILES_${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" 71FILES_${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"
71FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" 72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"