diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-06 15:04:05 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-06 15:04:05 +0000 |
| commit | 09e038b5a358d364a95269a1aed5940a6b913471 (patch) | |
| tree | 969ab0049577a3d1fc09dc0c3aaaef8a64ddd5fe | |
| parent | 0f407424b04fea1750ac10a358c1566c0a56ed4f (diff) | |
xserver-xorg: add CONFFILES for xorg.conf
| -rw-r--r-- | packages/xorg-xserver/xorg-xserver-common.inc | 6 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.bb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 0189a5d3b0..bd191eadfe 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -36,12 +36,14 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " +CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" + do_stage() { autotools_stage_all } do_install_append () { - install -d ${D}/etc/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 0b0f847dff..0a61cb2c7e 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r2" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ |