[oe-commits] Martin Jansa : xserver-nodm-init: rename old as 1.0, add version compatible with xserver-common as 2.0 (from buglabs)

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 435874e56cd4a82448ebb43d090fb68df497d16f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=435874e56cd4a82448ebb43d090fb68df497d16f

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr 16 23:06:40 2010 +0200

xserver-nodm-init: rename old as 1.0, add version compatible with xserver-common as 2.0 (from buglabs)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xserver-nodm-init-1.0}/xserver-nodm            |    0 
 .../xserver-nodm-init-2.0}/xserver-nodm            |   14 ++++----------
 .../xserver-nodm-init_1.0.bb}                      |    0 
 .../xserver-nodm-init_2.0.bb}                      |   15 +++------------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
similarity index 100%
copy from recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
copy to recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
similarity index 60%
rename from recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
rename to recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
index 1f0fa47..5a4b090 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
@@ -1,12 +1,6 @@
 #!/bin/sh
 
-killproc() {            # kill the named process(es)
-        pid=`/bin/ps -e x |
-             /bin/grep $1 |
-             /bin/grep -v grep |
-             /bin/sed -e 's/^  *//' -e 's/ .*//'`
-        [ "$pid" != "" ] && kill $pid
-}
+. /etc/init.d/functions
 
 for x in $(cat /proc/cmdline); do
         case $x in
@@ -24,10 +18,10 @@ case "$1" in
       $0 $1 background &
     else
        . /etc/profile
-       [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-       [ -z $HOME ] && export HOME=/home/$LOGNAME
+
        echo "Starting Xserver"
-       /etc/X11/Xserver &
+       . /etc/X11/xserver-common
+       xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS
     fi 
   ;;
 
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
similarity index 100%
copy from recipes/xserver-kdrive-common/xserver-nodm-init.bb
copy to recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
similarity index 51%
rename from recipes/xserver-kdrive-common/xserver-nodm-init.bb
rename to recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 01bdd55..91ccf06 100644
--- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-PR = "r11"
-RDEPENDS_${PN} = "procps"
+RDEPENDS = "xserver-common (>= 1.30) xinit"
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
@@ -19,13 +19,4 @@ do_install() {
 inherit update-rc.d
 
 INITSCRIPT_NAME = "xserver-nodm"
-# start earlier under the assumption that xserver takes seconds to start
-INITSCRIPT_PARAMS = "start 5 5 2 . stop 20 0 1 6 ."
-
-pkg_postinst_${PN} () {
-if test "x$D" = "x"; then
-	for f in `ls /etc/rc?.d/S99${INITSCRIPT_NAME} 2>/dev/null`; do
-		mv $f `dirname $f`/S05${INITSCRIPT_NAME}
-	done
-fi
-}
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 1 6 ."