summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-24 10:54:14 +0000
committerRoss Burton <ross@openedhand.com>2008-06-24 10:54:14 +0000
commit01c743d742357cd7b592e009e20dc2cfbb0b2b36 (patch)
tree32528aca6155abd2a6879f253ecb2ab9f3f6f895
parent9b63c68b0fdcc266d1c16aa40e2b2daadb48ccdd (diff)
downloadopenembedded-core-01c743d742357cd7b592e009e20dc2cfbb0b2b36.tar.gz
openembedded-core-01c743d742357cd7b592e009e20dc2cfbb0b2b36.tar.bz2
openembedded-core-01c743d742357cd7b592e009e20dc2cfbb0b2b36.zip
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
-rw-r--r--meta/packages/xorg-app/xrdb/60xXDefaults4
-rw-r--r--meta/packages/xorg-app/xrdb_1.0.5.bb8
2 files changed, 12 insertions, 0 deletions
diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60xXDefaults
new file mode 100644
index 0000000000..d3a284d8da
--- /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 177d3ab23b..6f0373c3be 100644
--- 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/
+}