diff options
Diffstat (limited to 'meta/packages')
17 files changed, 28 insertions, 165 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/01xrandr b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/01xrandr deleted file mode 100644 index abde87d53..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/01xrandr +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -xrandr -o normal - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/11zaurus b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/11zaurus deleted file mode 100644 index 61ca84b59..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/11zaurus +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ -z "`which chkhinge`" ]; then - # probably not a clamshell zaurus - exit 0 -fi - -chkhinge -e -if [ $? = 12 ]; then - xrandr -o right -fi - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/12keymap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/12keymap deleted file mode 100644 index abc14f866..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/12keymap +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` - -case $MACHINE in - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - case `uname -r` in - 2.4*) - xmodmap - < /etc/X11/shepherd.xmodmap - ;; - esac - ;; - "Sharp-Collie") - xmodmap - < /etc/X11/collie.xmodmap - ;; - "Simpad") - xmodmap - < /etc/X11/simpad.xmodmap - ;; - "HP iPAQ H2200") - xmodmap - < /etc/X11/h2200.xmodmap - ;; -esac - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate deleted file mode 100644 index 26d8551b1..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ ! -f /etc/pointercal ] && [ ! -z "$TSLIB_TSDEVICE" ]; then - /usr/bin/xtscal -fi - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/40xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/40xmodmap deleted file mode 100644 index 7ae3b5886..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/40xmodmap +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ -f /proc/hal/model ]; then - xmodmap -e 'keycode 104 = Return' -fi diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/55xScreenSaver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/55xScreenSaver deleted file mode 100644 index 5f6d0dae5..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/55xScreenSaver +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -xset s 30 180 -xset s off diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/60xXDefaults b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/60xXDefaults deleted file mode 100644 index 6b35e0357..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/60xXDefaults +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -xrdb -load -nocpp < /etc/X11/Xdefaults diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver index 88b8abbb2..64017fb8b 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver @@ -1,18 +1,19 @@ #!/bin/sh # -XSERVER=Xipaq +# note xinit needs full server path +XSERVER=/usr/bin/Xipaq if [ -f /usr/bin/Xfbdev ]; then - XSERVER=Xfbdev + XSERVER=/usr/bin/Xfbdev fi if [ -f /usr/bin/Xepson ]; then - XSERVER=Xepson + XSERVER=/usr/bin/Xepson fi if [ -f /usr/bin/Xorg ]; then - XSERVER=Xorg + XSERVER=/usr/bin/Xorg fi if [ -f /usr/bin/Xomap ]; then - XSERVER=Xomap + XSERVER=/usr/bin/Xomap fi . /etc/profile @@ -72,4 +73,6 @@ case `module_id` in ARGS="$ARGS -rgba vrgb" esac -exec $XSERVER $ARGS $* +DISPLAY=':0' + +exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession index cfa3a9a6e..b607462fe 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession @@ -19,29 +19,9 @@ if [ -f $HOME/.profile ]; then . $HOME/.profile fi -SYSSESSIONDIR=/etc/X11/Xsession-gpe.d +SYSSESSIONDIR=/etc/X11/Xsession.d -if [ ! -d $SYSSESSIONDIR ]; then - SYSSESSIONDIR=/etc/X11/Xsession.d -fi - -# Use run-parts to source every file in the session directory; we source -# instead of executing so that the variables and functions defined above -# are available to the scripts, and so that they can pass variables to each -# other. - -# Can't use run-parts like this, busybox doesn't support it. Use ls instead -#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) - -SESSIONFILES=`ls -X $SYSSESSIONDIR` -if [ -n "$SESSIONFILES" ]; then - for SESSIONFILE in $SESSIONFILES; do - # Test if script is executable first before sourcing it - if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then - . $SYSSESSIONDIR/$SESSIONFILE - fi - done -fi +run-parts $SYSSESSIONDIR exit 0 diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate new file mode 100644 index 000000000..8e6a8b22c --- /dev/null +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate @@ -0,0 +1,6 @@ +#!/bin/sh + +while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] +do + /usr/bin/xtscal +done diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/collie.xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/collie.xmodmap deleted file mode 100644 index 5c0b39dc8..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/collie.xmodmap +++ /dev/null @@ -1,5 +0,0 @@ -keycode 96 = XF86Calendar -keycode 97 = telephone -keycode 48 = XF86Start -keycode 98 = XF86Mail -keycode 117 = XF86PowerDown diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/h2200.xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/h2200.xmodmap deleted file mode 100644 index 736766efd..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/h2200.xmodmap +++ /dev/null @@ -1,5 +0,0 @@ -keycode 75 = XF86Calendar -keycode 76 = telephone -keycode 77 = XF86Mail -keycode 78 = XF86Start -keycode 124 = XF86PowerDown diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/shepherd.xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/shepherd.xmodmap deleted file mode 100644 index 0a03b4f42..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/shepherd.xmodmap +++ /dev/null @@ -1,49 +0,0 @@ -keycode 38 = Mode_switch -keycode 31 = w W caret -keycode 13 = e E equal -keycode 26 = r R plus -keycode 28 = t T bracketleft -keycode 33 = y y bracketright -keycode 29 = u U braceleft -keycode 17 = i I braceright -!keycode 73 = Tab Tab Caps_Lock -keycode 12 = d D periodcentered -keycode 14 = f F backslash -keycode 15 = g G semicolon -keycode 16 = h H colon -keycode 18 = j J asterisk -keycode 19 = k K currency -keycode 20 = l L bar -keycode 10 = b B underscore -keycode 66 = minus minus at -keycode 71 = comma slash less -keycode 72 = period question greater - -! Side keys -keycode 134 = Down -keycode 133 = Up -keycode 131 = Return -keycode 132 = Escape - -!Special keys -!keycode 96 = XF86Calendar -!keycode 97 = telephone -!keycode 98 = XF86Mail -!keycode 48 = XF86HomePage -!keycode 37 = XF86Start - -clear Shift -clear Lock -clear Control -clear Mod1 -clear Mod2 -clear Mod3 -clear Mod4 -clear Mod5 - -add Shift = Shift_L Shift_R -!add Lock = Caps_Lock -add Control = Control_L Control_R -add Mod1 = Alt_L Alt_R -add Mod2 = Mode_switch - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/simpad.xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/simpad.xmodmap deleted file mode 100644 index d8b73b207..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/simpad.xmodmap +++ /dev/null @@ -1,2 +0,0 @@ -keycode 102 = XF86PowerDown - diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index b1f06fe3b..04ac1c193 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal" -PR = "r6" +RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" +PR = "r7" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb index 5dff88918..d1ed98dfa 100644 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)" LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" -PR = "r6" +PR = "r7" SRC_URI = "file://xserver-nodm" S = ${WORKDIR} diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index eeab55a71..be405bc00 100755 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm @@ -8,8 +8,6 @@ killproc() { # kill the named process(es) [ "$pid" != "" ] && kill $pid } - - case "$1" in start) # We don't want this script to block the rest of the boot process @@ -20,28 +18,22 @@ case "$1" in echo "Starting Xserver" /etc/X11/Xserver & - - export DISPLAY=:0 - - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] - do - /usr/bin/xtscal - done - - /etc/X11/Xsession & fi ;; stop) echo "Stopping XServer" - killproc Xfbdev - killproc Xomap - killproc Xorg - killproc Xepson + killproc xinit + ;; + + restart) + $0 stop + sleep 1 + $0 start ;; *) - echo "usage: $0 { start | stop }" + echo "usage: $0 { start | stop | restart }" ;; esac |