xserver-common: use git patches and add functions file

* otherwise we were depending on initscripts to provide it without RDEPENDing on it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 13 insertions, 16 deletions

diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
index 4f99a90505..b0823bf61c 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-PR = "r5"
+PR = "r6"
 
 # we are using a gpe-style Makefile
 inherit gpe
@@ -11,24 +11,21 @@ SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14"
 SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210"
 
 SRC_URI_append = " \
-                   file://gplv2-license.patch \
-                   file://setDPI.sh \
-                   file://89xdgautostart.sh \
-                   file://89xTs_Calibrate.xinput_calibrator.patch \
-                   file://90xXWindowManager.patch \
-                   file://Xserver.add.xserver-system.patch \
-                   file://Xserver.add.nocursor.for.gta.patch \
-                   file://Xserver.add.dpi.for.gta.patch \
-                   file://Xserver.n900.patch \
-                   file://Xserver.nexuss.patch \
-                   file://Xserver.nexusone.patch \
-                   file://Xserver.gta04.patch \
+  file://0001-COPYING-add-GPLv2-license-file.patch \
+  file://0002-add-setdpi-Xinit.d-script.patch \
+  file://0003-add-89xdgautostart-Xsession.d-script.patch \
+  file://0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch \
+  file://0005-add-XWindowManager-Xsession.d-script.patch \
+  file://0006-add-support-for-etc-X11-xserver-system.patch \
+  file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \
+  file://0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch \
+  file://0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch \
+  file://0010-xserver-common-add-support-for-nexus-S-alias-herring.patch \
+  file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \
+  file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \
 "
 
-
 do_install_append() {
-        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-        install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
         sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common
 }