xrdb: move the xrdb xsession from xserver-kdrive-common to here

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4723 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60xXDefaults
new file mode 100644 (file)
index 0000000..d3a284d
--- /dev/null
+++ b/meta/packages/xorg-app/xrdb/60xXDefaults
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi

diff --git a/meta/packages/xorg-app/xrdb_1.0.5.bb b/meta/packages/xorg-app/xrdb_1.0.5.bb
index 177d3ab23bc448fe52979e2503d3f2cb30f6acfd..6f0373c3be1fbd6a8423c74fe6805b4655afdd3f 100644 (file)
--- a/meta/packages/xorg-app/xrdb_1.0.5.bb
+++ b/meta/packages/xorg-app/xrdb_1.0.5.bb
@@ -4,3 +4,11 @@ DESCRIPTION = "X server resource database utility"
 LICENSE = "xrdb"
 DEPENDS += "libxmu"
 PE = "1"
+PR = "r1"
+
+SRC_URI += "file://60xXDefaults"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/60xXDefaults ${D}${sysconfdir}/X11/Xsession.d/
+}