xserver-kdrive-common: enable overriding individual files

1 files changed, 32 insertions, 8 deletions

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 9d9b577766..64b1046ee9 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,17 +2,41 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r14"
+PR = "r15"
 
-SRC_URI = "file://etc"
-S = ${WORKDIR}
+SRC_URI = "\
+  file://Xdefaults \
+  file://Xinit \
+  file://Xserver \
+  file://Xsession \
+  \
+  file://30xTs_Calibrate \
+  file://60xXDefaults \
+  file://90xXWindowManager \
+  "
+
+etcFiles = "\
+  Xdefaults \
+  Xinit \
+  Xserver \
+  Xsession \
+  "
+sessionFiles = "\
+  30xTs_Calibrate \
+  60xXDefaults \
+  90xXWindowManager \
+  "
+
+S = "${WORKDIR}"
 
 PACKAGE_ARCH = "all"
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/*/.svn
-	rm -fR ${D}/etc/*/*/.svn
-	chmod -R 755 ${D}/etc
+    install -d ${D}/${sysconfdir}/X11/Xsession.d
+    for i in ${etcfiles}; do
+        install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/
+    done
+    for i in ${sessionFiles}; do
+        install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
+    done
 }