summaryrefslogtreecommitdiff
path: root/meta
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 /meta
parentda7a0511ea3a2da1d3215eb9f2d2cf1e56bb553c (diff)
downloadopenembedded-core-0504f934585cf06c1f572b048c45bee4bcc92715.tar.gz
openembedded-core-0504f934585cf06c1f572b048c45bee4bcc92715.tar.bz2
openembedded-core-0504f934585cf06c1f572b048c45bee4bcc92715.tar.xz
openembedded-core-0504f934585cf06c1f572b048c45bee4bcc92715.zip
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
Diffstat (limited to 'meta')
-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 1f326c7fe..12082d167 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
. /etc/profile
if [ -f $HOME/.profile ]; then
- . $HOME/.profile
+ . $HOME/.profile
fi
SYSSESSIONDIR=/etc/X11/Xsession.d
-run-parts $SYSSESSIONDIR
+for SESSIONFILE in $SYSSESSIONDIR/*; do
+ set +e
+ case "$SESSIONFILE" in
+ *.sh)
+ . "$SESSIONFILE"
+ ;;
+ *~)
+ # Ignore backup files
+ ;;
+ *)
+ "$SESSIONFILE"
+ ;;
+ esac
+ set -e
+done
exit 0
-
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 813123fc2..7bd88197d 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"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r29"
+PR = "r30"
SRC_URI = "file://etc"
S = ${WORKDIR}