summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver/xserver-xf86-common.inc
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-31 22:17:58 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-31 22:17:58 +0100
commitea26c2105d6fb5c9807efe9e558685fc89c30c3e (patch)
treea7fb2a773414ce8cd304aad3f828f1964ded065a /meta/packages/xorg-xserver/xserver-xf86-common.inc
parent185d8b084a13f46b8c356dc785f49753ee107db7 (diff)
downloadpoky-ea26c2105d6fb5c9807efe9e558685fc89c30c3e.tar.gz
xserver-xf86: Split xorg.conf from main xserver package
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xf86-common.inc')
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-common.inc9
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 5a10ecf994..f69efc8d67 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"
11PROVIDES += "virtual/xserver" 11PROVIDES += "virtual/xserver"
12 12
13XORG_PN = "xorg-server" 13XORG_PN = "xorg-server"
14SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ 14SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
15 file://xorg.conf"
16 15
17S = "${WORKDIR}/${XORG_PN}-${PV}" 16S = "${WORKDIR}/${XORG_PN}-${PV}"
18 17
@@ -20,6 +19,8 @@ inherit autotools_stage pkgconfig
20 19
21PACKAGES =+ "${PN}-utils" 20PACKAGES =+ "${PN}-utils"
22 21
22RDEPENDS_${PN} += "xserver-xf86-config"
23
23FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" 24FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
24FILES_${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 " 25FILES_${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 "
25FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" 26FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
@@ -29,13 +30,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
29 ${libdir}/xorg/modules/*/*/.debug \ 30 ${libdir}/xorg/modules/*/*/.debug \
30 " 31 "
31 32
32CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
33
34SRC_URI += "file://macro_tweak.patch;patch=1" 33SRC_URI += "file://macro_tweak.patch;patch=1"
35 34
36do_install_append () { 35do_install_append () {
37 install -d ${D}/${sysconfdir}/X11
38 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
39 ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts 36 ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
40} 37}
41 38