summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-07-04 08:53:31 +0000
committerRoss Burton <ross@openedhand.com>2008-07-04 08:53:31 +0000
commit0504f934585cf06c1f572b048c45bee4bcc92715 (patch)
tree321eab3fec73eb605ff693e7aeb07a53a5ceee0b
parentda7a0511ea3a2da1d3215eb9f2d2cf1e56bb553c (diff)
downloadpoky-0504f934585cf06c1f572b048c45bee4bcc92715.tar.gz
xserver-kdrive-common: don't use run-parts but instead exec or source scripts
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4812 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession19
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 17 insertions, 4 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
index 1f326c7fe4..12082d1672 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
@@ -15,12 +15,25 @@ fi
15. /etc/profile 15. /etc/profile
16 16
17if [ -f $HOME/.profile ]; then 17if [ -f $HOME/.profile ]; then
18 . $HOME/.profile 18 . $HOME/.profile
19fi 19fi
20 20
21SYSSESSIONDIR=/etc/X11/Xsession.d 21SYSSESSIONDIR=/etc/X11/Xsession.d
22 22
23run-parts $SYSSESSIONDIR 23for SESSIONFILE in $SYSSESSIONDIR/*; do
24 set +e
25 case "$SESSIONFILE" in
26 *.sh)
27 . "$SESSIONFILE"
28 ;;
29 *~)
30 # Ignore backup files
31 ;;
32 *)
33 "$SESSIONFILE"
34 ;;
35 esac
36 set -e
37done
24 38
25exit 0 39exit 0
26
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 813123fc2f..7bd88197d2 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5PR = "r29" 5PR = "r30"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}