From 435874e56cd4a82448ebb43d090fb68df497d16f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 16 Apr 2010 23:06:40 +0200 Subject: xserver-nodm-init: rename old as 1.0, add version compatible with xserver-common as 2.0 (from buglabs) Signed-off-by: Martin Jansa --- recipes/xserver-kdrive-common/xserver-nodm-init.bb | 31 -------------- .../xserver-nodm-init/xserver-nodm | 50 ---------------------- .../xserver-nodm-init-1.0/xserver-nodm | 50 ++++++++++++++++++++++ .../xserver-nodm-init-2.0/xserver-nodm | 44 +++++++++++++++++++ recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb | 31 ++++++++++++++ recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb | 22 ++++++++++ 6 files changed, 147 insertions(+), 81 deletions(-) delete mode 100644 recipes/xserver-kdrive-common/xserver-nodm-init.bb delete mode 100755 recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm create mode 100755 recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm create mode 100755 recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm create mode 100644 recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb create mode 100644 recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-kdrive-common/xserver-nodm-init.bb deleted file mode 100644 index 01bdd5559c..0000000000 --- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Simple Xserver Init Script (no dm)" -LICENSE = "GPL" -SECTION = "x11" -PRIORITY = "optional" -PR = "r11" -RDEPENDS_${PN} = "procps" - -SRC_URI = "file://xserver-nodm" -S = ${WORKDIR} - -PACKAGE_ARCH = "all" - -do_install() { - install -d ${D}/etc - install -d ${D}/etc/init.d - install xserver-nodm ${D}/etc/init.d -} - -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 -} diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm deleted file mode 100755 index 1f0fa47be6..0000000000 --- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 -} - -for x in $(cat /proc/cmdline); do - case $x in - x11=false) - echo "X Server disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - # We don't want this script to block the rest of the boot process - if [ "$2" != "background" ]; then - $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 & - fi - ;; - - stop) - echo "Stopping XServer" - killproc xinit - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm new file mode 100755 index 0000000000..1f0fa47be6 --- /dev/null +++ b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm @@ -0,0 +1,50 @@ +#!/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 +} + +for x in $(cat /proc/cmdline); do + case $x in + x11=false) + echo "X Server disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + # We don't want this script to block the rest of the boot process + if [ "$2" != "background" ]; then + $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 & + fi + ;; + + stop) + echo "Stopping XServer" + killproc xinit + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm new file mode 100755 index 0000000000..5a4b0904a3 --- /dev/null +++ b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm @@ -0,0 +1,44 @@ +#!/bin/sh + +. /etc/init.d/functions + +for x in $(cat /proc/cmdline); do + case $x in + x11=false) + echo "X Server disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + # We don't want this script to block the rest of the boot process + if [ "$2" != "background" ]; then + $0 $1 background & + else + . /etc/profile + + echo "Starting Xserver" + . /etc/X11/xserver-common + xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS + fi + ;; + + stop) + echo "Stopping XServer" + killproc xinit + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb new file mode 100644 index 0000000000..01bdd5559c --- /dev/null +++ b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Simple Xserver Init Script (no dm)" +LICENSE = "GPL" +SECTION = "x11" +PRIORITY = "optional" +PR = "r11" +RDEPENDS_${PN} = "procps" + +SRC_URI = "file://xserver-nodm" +S = ${WORKDIR} + +PACKAGE_ARCH = "all" + +do_install() { + install -d ${D}/etc + install -d ${D}/etc/init.d + install xserver-nodm ${D}/etc/init.d +} + +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 +} diff --git a/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb new file mode 100644 index 0000000000..91ccf06f63 --- /dev/null +++ b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Simple Xserver Init Script (no dm)" +LICENSE = "GPL" +SECTION = "x11" +PRIORITY = "optional" +RDEPENDS = "xserver-common (>= 1.30) xinit" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "file://xserver-nodm" +S = ${WORKDIR} + +PACKAGE_ARCH = "all" + +do_install() { + install -d ${D}/etc + install -d ${D}/etc/init.d + install xserver-nodm ${D}/etc/init.d +} + +inherit update-rc.d + +INITSCRIPT_NAME = "xserver-nodm" +INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 1 6 ." -- cgit v1.2.3