From c335f42133a0c16c2f9b5f9e7db0069694f8e96d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 28 Sep 2005 09:25:37 +0000
Subject: 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
---
openembedded/packages/meta/meta-oh.bb | 5 ++-
openembedded/packages/meta/oh-image.bb | 2 +-
.../etc/X11/Xsession.d/90xXWindowManager | 2 +-
.../xserver-kdrive-common_0.1.bb | 2 +-
.../xserver-kdrive-common/xserver-nodm-init.bb | 19 +++++++++++
.../xserver-nodm-init/xserver-nodm | 38 ++++++++++++++++++++++
6 files changed, 64 insertions(+), 4 deletions(-)
create mode 100644 openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
create mode 100755 openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
(limited to 'openembedded')
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index 9131b07ae..18562a84d 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
# oh-task-base
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r5"
+PR = "r6"
ALLOW_EMPTY = "1"
@@ -18,12 +18,15 @@ oh-task-base = "\
matchbox-poky \
xcursor-transparent-theme \
xserver-kdrive-common \
+ xserver-nodm-init \
gtk+ \
rxvt \
xhost \
gdb \
strace \
ttf-bitstream-vera \
+ udev \
+ sysfsutils \
xauth"
# avahi-daemon \
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index ca9f1b51a..60060b90f 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
export IMAGE_BASENAME = "oh-image"
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 baf50d1ab..b2b65a099 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 @@
if [ -x $HOME/.Xsession ]; then
exec $HOME/.Xsession
else
- exec /usr/win/x-window-manager
+ exec /usr/bin/x-window-manager
fi
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 c364e7fc5..f56497ceb 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"
SECTION = "x11"
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+PR = "r2"
SRC_URI = "file://etc"
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 000000000..d7aad8b4d
--- /dev/null
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Simple Xserver Init Script (no dm)"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "file://xserver-nodm"
+S = ${WORKDIR}
+
+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 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 000000000..dcafb9e98
--- /dev/null
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -0,0 +1,38 @@
+#!/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
+}
+
+case "$1" in
+ start)
+ echo "Starting Xserver"
+ /etc/X11/Xserver &
+ export DISPLAY=:0
+
+ while [ ! -f /etc/pointercal ]
+ do
+ /usr/bin/xtscal
+ done
+
+ /etc/X11/Xsession &
+ ;;
+
+ stop)
+ echo "Stopping XServer"
+ killproc /usr/bin/Xfbdev
+ killproc /usr/bin/Xomap
+ killproc /usr/bin/Xorg
+ killproc /usr/bin/Xepson
+ ;;
+
+ *)
+ echo "usage: $0 { start | stop }"
+ ;;
+esac
+
+exit 0
--
cgit v1.2.3