diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-28 09:25:37 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-28 09:25:37 +0000 |
commit | c335f42133a0c16c2f9b5f9e7db0069694f8e96d (patch) | |
tree | 2881e82839e0e0b8ee745eaf775061f92047763d /openembedded/packages/xserver-kdrive-common | |
parent | 66e9ae79755cff1df9aca0f88982a765d749ac87 (diff) | |
download | poky-c335f42133a0c16c2f9b5f9e7db0069694f8e96d.tar.gz |
Add xserver-nodm-init script, add udev+sysfsutils to meta-oh, fix typo in xserver-kdrive-common. The script calibrates the ts and starts the xserver but probbably does more than it should have to.
git-svn-id: https://svn.o-hand.com/repos/poky@47 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xserver-kdrive-common')
4 files changed, 59 insertions, 2 deletions
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager index baf50d1abe..b2b65a0993 100644 --- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager +++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager | |||
@@ -2,7 +2,7 @@ | |||
2 | if [ -x $HOME/.Xsession ]; then | 2 | if [ -x $HOME/.Xsession ]; then |
3 | exec $HOME/.Xsession | 3 | exec $HOME/.Xsession |
4 | else | 4 | else |
5 | exec /usr/win/x-window-manager | 5 | exec /usr/bin/x-window-manager |
6 | fi | 6 | fi |
7 | 7 | ||
8 | 8 | ||
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index c364e7fc57..f56497cebd 100644 --- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPL" | |||
3 | SECTION = "x11" | 3 | SECTION = "x11" |
4 | DEPENDS = "xmodmap xrandr xdpyinfo xtscal" | 4 | DEPENDS = "xmodmap xrandr xdpyinfo xtscal" |
5 | RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" | 5 | RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | 7 | ||
8 | SRC_URI = "file://etc" | 8 | SRC_URI = "file://etc" |
9 | S = ${WORKDIR} | 9 | S = ${WORKDIR} |
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb new file mode 100644 index 0000000000..d7aad8b4d9 --- /dev/null +++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | DESCRIPTION = "Simple Xserver Init Script (no dm)" | ||
2 | LICENSE = "GPL" | ||
3 | SECTION = "x11" | ||
4 | PRIORITY = "optional" | ||
5 | PR = "r0" | ||
6 | |||
7 | SRC_URI = "file://xserver-nodm" | ||
8 | S = ${WORKDIR} | ||
9 | |||
10 | do_install() { | ||
11 | install -d ${D}/etc | ||
12 | install -d ${D}/etc/init.d | ||
13 | install xserver-nodm ${D}/etc/init.d | ||
14 | } | ||
15 | |||
16 | inherit update-rc.d | ||
17 | |||
18 | INITSCRIPT_NAME = "xserver-nodm" | ||
19 | INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." | ||
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm new file mode 100755 index 0000000000..dcafb9e98f --- /dev/null +++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | |||
@@ -0,0 +1,38 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | killproc() { # kill the named process(es) | ||
4 | pid=`/bin/ps -e x | | ||
5 | /bin/grep $1 | | ||
6 | /bin/grep -v grep | | ||
7 | /bin/sed -e 's/^ *//' -e 's/ .*//'` | ||
8 | [ "$pid" != "" ] && kill $pid | ||
9 | } | ||
10 | |||
11 | case "$1" in | ||
12 | start) | ||
13 | echo "Starting Xserver" | ||
14 | /etc/X11/Xserver & | ||
15 | export DISPLAY=:0 | ||
16 | |||
17 | while [ ! -f /etc/pointercal ] | ||
18 | do | ||
19 | /usr/bin/xtscal | ||
20 | done | ||
21 | |||
22 | /etc/X11/Xsession & | ||
23 | ;; | ||
24 | |||
25 | stop) | ||
26 | echo "Stopping XServer" | ||
27 | killproc /usr/bin/Xfbdev | ||
28 | killproc /usr/bin/Xomap | ||
29 | killproc /usr/bin/Xorg | ||
30 | killproc /usr/bin/Xepson | ||
31 | ;; | ||
32 | |||
33 | *) | ||
34 | echo "usage: $0 { start | stop }" | ||
35 | ;; | ||
36 | esac | ||
37 | |||
38 | exit 0 | ||