diff options
author | Ross Burton <ross@openedhand.com> | 2008-07-04 09:15:57 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-07-04 09:15:57 +0000 |
commit | fa001bc0b4f7f1dea84b6d8b778eae13286b9a9c (patch) | |
tree | 7a763964c9a7532476b77022f762c9558804ba18 | |
parent | 8fab210b2f5b850de9cc5b72aba1b6bfd2a38514 (diff) | |
download | poky-fa001bc0b4f7f1dea84b6d8b778eae13286b9a9c.tar.gz |
xrdb: use .sh session script
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4816 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/xorg-app/xrdb/60XDefaults.sh (renamed from meta/packages/xorg-app/xrdb/60xXDefaults) | 1 | ||||
-rw-r--r-- | meta/packages/xorg-app/xrdb_1.0.5.bb | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60XDefaults.sh index d3a284d8da..08d8beca33 100644 --- a/meta/packages/xorg-app/xrdb/60xXDefaults +++ b/meta/packages/xorg-app/xrdb/60XDefaults.sh | |||
@@ -1,4 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | if [ -e $HOME/.Xdefaults ]; then | 1 | if [ -e $HOME/.Xdefaults ]; then |
3 | xrdb -merge -nocpp < $HOME/.Xdefaults | 2 | xrdb -merge -nocpp < $HOME/.Xdefaults |
4 | fi | 3 | fi |
diff --git a/meta/packages/xorg-app/xrdb_1.0.5.bb b/meta/packages/xorg-app/xrdb_1.0.5.bb index 6f0373c3be..906d7d8527 100644 --- a/meta/packages/xorg-app/xrdb_1.0.5.bb +++ b/meta/packages/xorg-app/xrdb_1.0.5.bb | |||
@@ -4,11 +4,11 @@ DESCRIPTION = "X server resource database utility" | |||
4 | LICENSE = "xrdb" | 4 | LICENSE = "xrdb" |
5 | DEPENDS += "libxmu" | 5 | DEPENDS += "libxmu" |
6 | PE = "1" | 6 | PE = "1" |
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | SRC_URI += "file://60xXDefaults" | 9 | SRC_URI += "file://60XDefaults.sh" |
10 | 10 | ||
11 | do_install_append() { | 11 | do_install_append() { |
12 | install -d ${D}${sysconfdir}/X11/Xsession.d/ | 12 | install -d ${D}${sysconfdir}/X11/Xsession.d/ |
13 | install -m 0755 ${WORKDIR}/60xXDefaults ${D}${sysconfdir}/X11/Xsession.d/ | 13 | install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/ |
14 | } | 14 | } |