[oe-commits] org.oe.dev xserver-xorg: add CONFFILES for xorg.conf

[koen commit]

xserver-xorg: add CONFFILES for xorg.conf

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5565cda387e227c33c34f8743f541e7737fc5b1b
ViewMTN: http://monotone.openembedded.org/revision/info/5565cda387e227c33c34f8743f541e7737fc5b1b
Files:
1
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:

#
# mt diff -r3ec74f15e6080a6f7a20f84d153f8f6c5de68589 -r5565cda387e227c33c34f8743f541e7737fc5b1b
#
#
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [dc8d79997ec36fdb922741dc4c5ae140970f9e12]
#    to [f246fbf0028822fd0a27404cfc02bb19da3ad7cb]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [4390a6545e73aa1015da701f862ee96c21cca2b6]
#    to [bfac91f5fae3ca879600e9617161fd20d17d8953]
#
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	dc8d79997ec36fdb922741dc4c5ae140970f9e12
+++ packages/xorg-xserver/xorg-xserver-common.inc	f246fbf0028822fd0a27404cfc02bb19da3ad7cb
@@ -36,12 +36,14 @@ FILES_${PN}-dbg += "${libdir}/xorg/modul
 		    ${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
 }
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	4390a6545e73aa1015da701f862ee96c21cca2b6
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	bfac91f5fae3ca879600e9617161fd20d17d8953
@@ -3,7 +3,7 @@ PE = "1"
 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 \