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
This commit is contained in:
parent
66e9ae7975
commit
c335f42133
|
@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
|
||||||
# oh-task-base
|
# oh-task-base
|
||||||
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
|
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
|
||||||
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
|
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
||||||
ALLOW_EMPTY = "1"
|
ALLOW_EMPTY = "1"
|
||||||
|
|
||||||
|
@ -18,12 +18,15 @@ oh-task-base = "\
|
||||||
matchbox-poky \
|
matchbox-poky \
|
||||||
xcursor-transparent-theme \
|
xcursor-transparent-theme \
|
||||||
xserver-kdrive-common \
|
xserver-kdrive-common \
|
||||||
|
xserver-nodm-init \
|
||||||
gtk+ \
|
gtk+ \
|
||||||
rxvt \
|
rxvt \
|
||||||
xhost \
|
xhost \
|
||||||
gdb \
|
gdb \
|
||||||
strace \
|
strace \
|
||||||
ttf-bitstream-vera \
|
ttf-bitstream-vera \
|
||||||
|
udev \
|
||||||
|
sysfsutils \
|
||||||
xauth"
|
xauth"
|
||||||
|
|
||||||
# avahi-daemon \
|
# avahi-daemon \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
export IMAGE_BASENAME = "oh-image"
|
export IMAGE_BASENAME = "oh-image"
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
if [ -x $HOME/.Xsession ]; then
|
if [ -x $HOME/.Xsession ]; then
|
||||||
exec $HOME/.Xsession
|
exec $HOME/.Xsession
|
||||||
else
|
else
|
||||||
exec /usr/win/x-window-manager
|
exec /usr/bin/x-window-manager
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ LICENSE = "GPL"
|
||||||
SECTION = "x11"
|
SECTION = "x11"
|
||||||
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
|
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
|
||||||
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
|
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "file://etc"
|
SRC_URI = "file://etc"
|
||||||
S = ${WORKDIR}
|
S = ${WORKDIR}
|
||||||
|
|
|
@ -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 ."
|
|
@ -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
|
Loading…
Reference in New Issue