diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9b474de120..bea0252259 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -66,7 +66,6 @@ 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 | RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})" | ||
70 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | 69 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" |
71 | 70 | ||
72 | 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" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb index 2512fb2351..a219f814ac 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | |||
@@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \ | |||
10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" | 10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" |
11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" | 11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" |
12 | 12 | ||
13 | PR = "r9" | 13 | PR = "r10" |