diff options
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xf86-common.inc')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-common.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc index 5a10ecf99..f69efc8d6 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-common.inc +++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc @@ -11,8 +11,7 @@ PROVIDES = "virtual/xserver-xf86" PROVIDES += "virtual/xserver" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ - file://xorg.conf" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" @@ -20,6 +19,8 @@ inherit autotools_stage pkgconfig PACKAGES =+ "${PN}-utils" +RDEPENDS_${PN} += "xserver-xf86-config" + FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" @@ -29,13 +30,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " -CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" - SRC_URI += "file://macro_tweak.patch;patch=1" do_install_append () { - install -d ${D}/${sysconfdir}/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } |